CategoryDatastore now fleshed out. Found and fixed another bug in other *Datastore classes where an integer was being treated like an object