Merge pull request #19 from ArcBees/brandon_presenter18

Working on NameTokens.