New branch
EventBus now final.