Renaming
Make separate class for socket handling