Rearrange the functions of the cleaned up version of model controller
Merge github.com:princeedward/SimulationPlugins