Teaching for Tomorrow : Teaching Content and Problem-Solving Skills