Final commit for assignment 2 part 2