Refactored in prep for definition of the various connection types.