Continued implementation of token hashing - WIP