Feature/category feeds reol 82

Bah, bad rebase.