Generated new models, set up some relationships
Some changes in the controllers