WIP on adding pub/sub