BROKEN - Converting to TCP

A bad change to TCP. Hope to clean up.