beginning rearchitect, with included tests, and things
whitespace
updating readme
updating design
Merge pull request #7 from itsthatguy/rearchitect-with-tests

Rearchitect with tests
color tweak