change models
fix conflicts
destroy Events scaffold because mad
fix conflicts