More tree gen work