Broke out the machine state and status and am pulling out more of the controller