Server Modified Files

Server modified files from straight stock seco7 - don't expect it to
compile.