Started work on converting the old pubsub to a deferred pubsub.