Steve's refactoring, and things to work on
Merge branch 'master' of https://github.com/yvettecook/takeaway