Change the client / connection relationship so we can have multiple connections