Replace category trait/objects with Enumeration,  add test data
Add list controller