Start of migrating to use a google event bus