Fixed up event bus (ignore the format derp, should resolve itself over
time)