Started exploring having several categories per kind again, still with some kind indexing