Adding some funky socket stuff