Move event trigger/on to the EventBus
Rename saveAndTrigger to saveAndPublish
Cleanup
Refactor and Cleanup