Starting event emitter rework