Add a 'Return Mode' concept to be used when we move from TM back to the saved goal. make getNextGoal() to setNextGoal() and handle hitting 'n' even in the middle of a return mode