A little work on the server