Feature/client sockets