Revert "Chris refactor"

Reverts Tr1ckX/Takeaway#1