Removing event emitters and handlers, adds extra layer of complexity. Going to directly couple, need to think about how to deal with returns