NEW TOKENS! yeaaaa!

Bout time too! Tokens v2!