Continuing to refactor and expand RelationshipBuilder functionality.