Merged with master and added Category get and create functions