Work in progress commit - category add and edit almost complete