More work on the connection class.