Fiddling with how the pubsub client will work