Prepared it for the socket handling i'm adding later