socket testing WIP
Merge branch 'master' into jseip1679