I'm not entire sure of the current event system since it maybe removed in favor of utilizing the pubsub. For now, I think this is fine and we can revisit this later if need be.