First working commit with socket