More tree gen work... yet again.