Starting to add category functionality