WIP
Refactored tokens to reside on the manager.