Implement s2s metadata stuff
Properly add a remote user