Think I'm adding a complete token definition thing