WIP

Conflicts:
	cider/services/pubsub/service.go