Add exercise 16
Add exercise 17