Quitting works again, now transitioning to tokens