Submit working.

Server and Client review cont.