Nearly working.  Token regeneration messes up data