Nigel's socket code being integrated