WIP. Working in invariant 2 for TokenUtils