Sockets and stuff
Merge branch 'Sockets'