Complete Solution

I'm checking in the student starter, but I didn't update for the new
data.  Also the starter should be edited to follow the solution
structure as closely as possible...