Control branch

Cleaned up the control script