Started work to reduce coupling between controllers