Adding extra credit work from exercise 16'