Refactoring day 1
Merge pull request #2 from ccummings/wip

Refactoring day 1