Update Controllers and Test/Play mode started

refactored controllers and some other little stuff. Started
implementing test/play mode.