First pass of working the tree selector into TokenUtils and related.
Now to make it work.