08-Modularize

IN PROGRESS- Probably lots of errors