Token generation possibly working now. Have not yet tested. EOD