Complete exercise 2 plus extras