Added dirty tree building support
Really added it