Changed the models and controllers... will need to fix up