Do away with pubsub stuff. Too complicated.