change class name, now have Server and Connection