Lots of working socket updates