some work on make-connector.  will require rethinking, though