Finish changes for assignment 1

Ready to be graded