refactor - the end is near. Upvoting now via pubsub