WIP migration to tcp server
more migration to tcpServer
small conversion updates