This'll save a lot of work
Adds ability to close data socket