Some work on event dispatching