Worked through whole tree, finished with TreeBuilder. Cleaned up some redundant code.