Finally finished completing the categories stuff