Initial catagory work
Catagories are now being included, but all these other changes should be reverted, including some of the migrations.