refactoring the event broker
get event emitters to work correctly