adding in event emitter and tests