WIP 3.0 tree behavior

Please ignore for now.. This PR has been created prematurely