Socket
Fix merge conflicts and http works! Yay!