sockets working
merge
merging