Rejigger flow and add notes about saving