Special connections

ref #52 

Adds support for the Case 2 and 3 connections
Fixes the reported bug