Controller not getting GOGO commands
Some refactoring
Update merge from local master.