WIP: Separate minion controller from master.