Redoing treemanager

So much better.  I feel less dirty now.