#43 - Alright, refactor without causing a million merge conflicts.
Merge pull request #47 from mattjbrown/refactor

Auto-merging pull request. Beep Boop.