A bit more work on TCP server.

I'm going to start working more diligently on this tommorow, the last
week hasn't really been productive.