changes to model, routes and templates