Fix the server, still compiles, still untested