Refactored for inheritance
Refactored for generic Connection
Refactored to reflect changes in Connection class
Misc removal of mistakenly added files