[WIP] Implement categories