Restarted homework1.0 - didn't do a lot of new changes