Redesigned schema and models, added catagories