Josh commit: socket management