Category infra

Fixes #345
Agreed.