Done some more work on exercise 5