cleaning up the connections a bit
working on dry'ing up the base classes