Initial work

Tests for all the methods on the reduced EventBus interface would good (there aren't many)