Categories are back!!!

Not sure why I'm so excited about this PR.