Initial checkin of the reformed code
Merge branch 'master' of https://github.com/paranhaslett/RefactorCatagories
need to merge .gitignore?