Initial pass at categories
Merge pull request #3 from maxnachlinger/master

Initial pass at categories