working on the server some more