native + part of server work
commit for ServerSync