More working up of tree infrastructure