Revert "Revert "Trees v3.0""

This reverts commit b4e847620981aa8e17f120aead72729031d8225c.