Exercise 2 - looking better
Exercise 2 - complete (I think)

Not really sure if that's the state the homework should be in, but I
continue and change it if necessary.