Client2server first commit - WIP

Far from finished work, just sync with git...