WIP : Working on the event dispatcher

Figured out how to make it work