[wip] Feature/category