Fixing up Connection to implement other methods.
ARGH!!!!
Test???
Conflicts Fixed.