More progress on Soccket code