Reformat
First cut of more complicated turn state engine