split up SetClientSocket
Merge branch 'josh'