Finished part 1 of assignment 2