lots of table and model changes -- add new model Categorization