Probably added ability to test client/Server