Had to add back in the start and end time step functions, which breaks optimization but fixes adaptivity.