Added category system
Herp Derp