Mega update  to th e event controller and model