Exercise 7.1

Do exercise 7.1 from the book.

This is on top of #347