Exercise 17 and cleanup to other exercises