Created Category class; improved category functionality