Simulation Controller Rewrite
Done

Testing is left