Began patching up categories functionality