More work on server connection