Major PubSub rewrite in progress