Revert "Chris refactor"
Merge pull request #2 from Tr1ckX/revert-1-chris_refactor

Revert "Chris refactor"