registration works
merging with server