change the way token storage is implemetned to queue so I can easily pop off instead of keeping track of index.