WIP : Some progress on the event dispatcher functions.