Finished adding category functionality. (delete to be finished)