More work on the server/session