Changed how the message bus works. Not sure what the performance impact is with what I've done, but it seems to work fine.