Remove the 'wait' concept and replace it with end turn.