Some forward progress with the ifStatement fixup - almost done - and then onto the while loops