Updating a lot of stuff
Assignment 7 - first commit