[WIP] Taxonomy refactor