Moved all category code into the category section