WIP Additions to connection tree building.
WIP Redesign connection and builder logic.