WIP on better event propagation.