Yet another rewriting of server...