Finished part 1 of the assignment