Continuing to move terminal states and options out of main