Added an EventBus to the mix.