Did some more work on exercise 1