Completed chapter 7, pending exercise 2