Continued work on socket events