tree rework
Merge pull request #1 from onethirtyfive/master

Tree rework