Working on SocketIO clean up messaging etc