mostly finishes adam tree

title
fixes merge conflict

title