Connection update

closes #10  but introduces #11.