New categories

@ndonald2 Yeah, this is intended to merge.
Good point about type safety. I'm ok with closing this PR.