Changes to controllers and new model WITH events