Trees and such changes, preparing for a rewrite