More work on the server, really clean now