New categories

@ndonald2 Yeah, this is intended to merge.
This should be prefixed.