ConnnectCommand now takes multiple points. Fixes and refactors