deal with conflict, now new:
add functions:
client to server, server to client