The Reworking Begins
Lots of Changes
Merge pull request #26 from chrishumboldt/dev-chris

Dev chris