Port to SocketServer/Socket combo successful!

Merging master and testing branch.