Broken--more server connection refactoring