Finished Ex. 6 of first module.  Make it Modular