Connector line is a little smarter.  Still needs work.