Using the socket client branch for development