Redo the wiring up of events