Finished part 2 of the homework and updated some of the other files