WIP Refactor of builder to work with connection trees.