inished first pass at connectorator