WIP Untested modifications to work with TCP connections