Reformed the socket and reorientation system, but did not implement all new code