Started working on the new category system