wip
cache tokens
Style changes