Missing functionality from exit-to-broadcast

Missed off the last commit from exit-to-broadcast feature branch.