Experimental branch for tree nav