Fixes #73 and adds category to hero

We should probably macro this big set of conditionals, no?