Added basic socket functionality
Merged changes