M3 Server code committed