Exercise 2 almost complete, needs to be combined