Finish coding on exercise 1