Add initial socket.io
Merge