Added category stuff
Editing helpers to clean up
Working on filtering