Exercise 5 done.  Still need to test these.