Integrate MPC changes

Integrates JJ's MPC work into usage by the GUI.