More work on server and client