wip/hs-categories
