WIP
WIP
WIP
WIP
EventHandler: refactor how listeners are handled
Clean up eventHandler tests