Homework part 2 finished