WIP: Making pub/sub more efficient