Add in some better handling for events.