Move event stuff to event_model