WIP - Add event dispatcher