adding initial socket code
Merge branch 'sockets-dev' into dev