Brandon presenter18

Tuning NameTokens. I'm almost done with this.