Genericified a lot to ease testing
Started adding ability to identify nodes between trees.