Exercise 2 finished (hopefully)