Adds exercise 15 and 16.