Replace logic for cut and user abort, going to get rid of GoalFrame.