Lots of controll scheme changes and debugging