More work on control bus refactor...