More work done on server connection.