Beginning refactoring of the event_callback outside of the core