Added Aaron's working socket stuff.