want to use type for better categorization

Need a real class here
Merge branch 'typed-categorization'