diff --git a/lib/socketserver/GwSocketServer.cpp b/lib/socketserver/GwSocketServer.cpp
index f9c7f6d..a7f788f 100644
--- a/lib/socketserver/GwSocketServer.cpp
+++ b/lib/socketserver/GwSocketServer.cpp
@@ -3,188 +3,379 @@
 #include <lwip/sockets.h>
 #include "GwBuffer.h"
 
-class GwClient{
-    public:
-        wiFiClientPtr client;
-        int overflows;
-        String remoteIp;
-    private:
-        unsigned long lastWrite=0;
-        unsigned long writeTimeout=10000;
-        bool pendingWrite=false;
-        bool writeError=false; 
-        bool allowRead;
-        GwBuffer *buffer=NULL;
-        GwBuffer *readBuffer=NULL;
-        GwLog *logger;
-    public:        
-        GwClient(wiFiClientPtr client,GwLog *logger,int id, bool allowRead=false){
-            this->client=client;
-            this->logger=logger;
-            this->allowRead=allowRead;
-            String bufName="Sock(";
-            bufName+=String(id);
-            bufName+=")";
-            buffer=new GwBuffer(logger,GwBuffer::TX_BUFFER_SIZE,bufName+"wr");
-            if (allowRead){
-                readBuffer=new GwBuffer(logger,GwBuffer::RX_BUFFER_SIZE,bufName+"rd");
-            }
-            overflows=0;
-            if (client != NULL){
-                remoteIp=client->remoteIP().toString();
-            }
+class GwClient
+{
+public:
+    int fd=-1;
+    int overflows;
+    String remoteIpAddress;
+
+private:
+    unsigned long lastWrite = 0;
+    unsigned long writeTimeout = 10000;
+    bool pendingWrite = false;
+    bool writeError = false;
+    bool allowRead;
+    GwBuffer *buffer = NULL;
+    GwBuffer *readBuffer = NULL;
+    GwLog *logger;
+
+public:
+    static IPAddress remoteIP(int fd)
+    {
+        struct sockaddr_storage addr;
+        socklen_t len = sizeof addr;
+        getpeername(fd, (struct sockaddr*)&addr, &len);
+        struct sockaddr_in *s = (struct sockaddr_in *)&addr;
+        return IPAddress((uint32_t)(s->sin_addr.s_addr));
+    }
+    GwClient(GwLog *logger, int id, bool allowRead = false)
+    {
+        this->logger = logger;
+        this->allowRead = allowRead;
+        String bufName = "Sock(";
+        bufName += String(id);
+        bufName += ")";
+        buffer = new GwBuffer(logger, GwBuffer::TX_BUFFER_SIZE, bufName + "wr");
+        if (allowRead)
+        {
+            readBuffer = new GwBuffer(logger, GwBuffer::RX_BUFFER_SIZE, bufName + "rd");
         }
-        void setClient(wiFiClientPtr client){
-            this->client=client;
-            buffer->reset("new client");
-            if (readBuffer) readBuffer->reset("new client");
-            overflows=0;
-            pendingWrite=false;
-            writeError=false;
-            lastWrite=0;
-            if (client){
-                remoteIp=client->remoteIP().toString();
-            }
-            else{
-                remoteIp=String("---");
-            }
+        overflows = 0;
+    }
+    void setClient(int fd)
+    {
+        this->fd = fd;
+        buffer->reset("new client");
+        if (readBuffer)
+            readBuffer->reset("new client");
+        overflows = 0;
+        pendingWrite = false;
+        writeError = false;
+        lastWrite = 0;
+        if (fd >= 0)
+        {
+            remoteIpAddress = remoteIP(fd).toString();
         }
-        bool hasClient(){
-            return client != NULL;
+        else
+        {
+            remoteIpAddress = String("---");
         }
-        ~GwClient(){
-            delete buffer;
-            if (readBuffer) delete readBuffer;
+    }
+    bool hasClient()
+    {
+        return fd >= 0;
+    }
+    void stop(){
+        if (fd >= 0){
+            close(fd);
+            fd=-1;
         }
-        bool enqueue(uint8_t *data, size_t len){
-            if (len == 0) return true;
-            size_t rt=buffer->addData(data,len);
-            if (rt < len){
-                LOG_DEBUG(GwLog::LOG,"overflow on %s",remoteIp.c_str());
-                overflows++;
-                return false;
-            }
-            return true;
-        }
-        bool hasData(){
-            return buffer->usedSpace() > 0;
-        }
-        bool handleError(int res,bool errorIf0=true){
-            if (res == 0 && errorIf0){
-                LOG_DEBUG(GwLog::LOG,"client shutdown (recv 0) on %s",remoteIp.c_str());
-                client->stop();
-                return false;
-            }
-            if (res < 0){
-                if (errno != EAGAIN){
-                    LOG_DEBUG(GwLog::LOG,"client read error %d on %s",errno,remoteIp.c_str());
-                    client->stop();
+    }
+    ~GwClient()
+    {
+        delete buffer;
+        if (readBuffer)
+            delete readBuffer;
+    }
+    bool connected()
+    {
+        if (fd >= 0)
+        {
+            uint8_t dummy;
+            int res = recv(fd, &dummy, 0, MSG_DONTWAIT);
+            // avoid unused var warning by gcc
+            (void)res;
+            // recv only sets errno if res is <= 0
+            if (res <= 0)
+            {
+                switch (errno)
+                {
+                case EWOULDBLOCK:
+                case ENOENT: //caused by vfs
+                    return true;
+                    break;
+                case ENOTCONN:
+                case EPIPE:
+                case ECONNRESET:
+                case ECONNREFUSED:
+                case ECONNABORTED:
                     return false;
+                    break;
+                default:
+                    return true;
                 }
+            }
+            else
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    bool enqueue(uint8_t *data, size_t len)
+    {
+        if (len == 0)
+            return true;
+        size_t rt = buffer->addData(data, len);
+        if (rt < len)
+        {
+            LOG_DEBUG(GwLog::LOG, "overflow on %s", remoteIpAddress.c_str());
+            overflows++;
+            return false;
+        }
+        return true;
+    }
+    bool hasData()
+    {
+        return buffer->usedSpace() > 0;
+    }
+    bool handleError(int res, bool errorIf0 = true)
+    {
+        if (res == 0 && errorIf0)
+        {
+            LOG_DEBUG(GwLog::LOG, "client shutdown (recv 0) on %s", remoteIpAddress.c_str());
+            stop();
+            return false;
+        }
+        if (res < 0)
+        {
+            if (errno != EAGAIN)
+            {
+                LOG_DEBUG(GwLog::LOG, "client read error %d on %s", errno, remoteIpAddress.c_str());
+                stop();
                 return false;
             }
-            return true;
+            return false;
         }
-        GwBuffer::WriteStatus write(){
-            if (! hasClient()) {
-                LOG_DEBUG(GwLog::LOG,"write called on empty client");
-                return GwBuffer::ERROR;
-            }
-            if (! buffer->usedSpace()){
-                pendingWrite=false;
-                return GwBuffer::OK;
-            }
-            buffer->fetchData(-1,[](uint8_t *buffer, size_t len, void *param)->size_t{
-                GwClient *c=(GwClient*)param;
-                int res = send(c->client->fd(), (void*) buffer, len, MSG_DONTWAIT);
-                if (! c->handleError(res,false)) return 0;
-                if (res >= len){
-                    c->pendingWrite=false;
+        return true;
+    }
+    GwBuffer::WriteStatus write()
+    {
+        if (!hasClient())
+        {
+            LOG_DEBUG(GwLog::LOG, "write called on empty client");
+            return GwBuffer::ERROR;
+        }
+        if (!buffer->usedSpace())
+        {
+            pendingWrite = false;
+            return GwBuffer::OK;
+        }
+        buffer->fetchData(
+            -1, [](uint8_t *buffer, size_t len, void *param) -> size_t
+            {
+                GwClient *c = (GwClient *)param;
+                int res = send(c->fd, (void *)buffer, len, MSG_DONTWAIT);
+                if (!c->handleError(res, false))
+                    return 0;
+                if (res >= len)
+                {
+                    c->pendingWrite = false;
                 }
-                else{
-                    if (!c->pendingWrite){
-                        c->lastWrite=millis();
-                        c->pendingWrite=true;
+                else
+                {
+                    if (!c->pendingWrite)
+                    {
+                        c->lastWrite = millis();
+                        c->pendingWrite = true;
                     }
-                    else{
-                        //we need to check if we have still not been able 
+                    else
+                    {
+                        //we need to check if we have still not been able
                         //to write until timeout
-                        if (millis() >= (c->lastWrite+c->writeTimeout)){
-                            c->logger->logDebug(GwLog::ERROR,"Write timeout on channel %s",c->remoteIp.c_str());
-                            c->writeError=true;
+                        if (millis() >= (c->lastWrite + c->writeTimeout))
+                        {
+                            c->logger->logDebug(GwLog::ERROR, "Write timeout on channel %s", c->remoteIpAddress.c_str());
+                            c->writeError = true;
                         }
                     }
                 }
                 return res;
-            },this);
-            if (writeError){
-                LOG_DEBUG(GwLog::DEBUG+1,"write error on %s",remoteIp.c_str());
-                return GwBuffer::ERROR;
-            }
-                
-            return GwBuffer::OK;
+            },
+            this);
+        if (writeError)
+        {
+            LOG_DEBUG(GwLog::DEBUG + 1, "write error on %s", remoteIpAddress.c_str());
+            return GwBuffer::ERROR;
         }
-        
-        bool read(){
-            if (! allowRead){
-                size_t maxLen=100;
-                char buffer[maxLen];
-                int res = recv(client->fd(), (void*) buffer, maxLen, MSG_DONTWAIT);
-                return handleError(res);
-            }
-            readBuffer->fillData(-1,[](uint8_t *buffer, size_t len, void *param)->size_t{
-                GwClient *c=(GwClient*)param;
-                int res = recv(c->client->fd(), (void*) buffer, len, MSG_DONTWAIT);
-                if (! c->handleError(res)) return 0;
+
+        return GwBuffer::OK;
+    }
+
+    bool read()
+    {
+        if (!allowRead)
+        {
+            size_t maxLen = 100;
+            char buffer[maxLen];
+            int res = recv(fd, (void *)buffer, maxLen, MSG_DONTWAIT);
+            return handleError(res);
+        }
+        readBuffer->fillData(
+            -1, [](uint8_t *buffer, size_t len, void *param) -> size_t
+            {
+                GwClient *c = (GwClient *)param;
+                int res = recv(c->fd, (void *)buffer, len, MSG_DONTWAIT);
+                if (!c->handleError(res))
+                    return 0;
                 return res;
-            },this);
-            return true;
-        }
-        bool messagesFromBuffer(GwMessageFetcher *writer){
-            if (! allowRead) return false;
-            return writer->handleBuffer(readBuffer);
-        }
+            },
+            this);
+        return true;
+    }
+    bool messagesFromBuffer(GwMessageFetcher *writer)
+    {
+        if (!allowRead)
+            return false;
+        return writer->handleBuffer(readBuffer);
+    }
 };
 
-
-GwSocketServer::GwSocketServer(const GwConfigHandler *config,GwLog *logger,int minId){
-    this->config=config;
-    this->logger=logger;
-    this->minId=minId;
-    maxClients=1;
-    allowReceive=false;
-}
-void GwSocketServer::begin(){
-    maxClients=config->getInt(config->maxClients);
-    allowReceive=config->getBool(config->readTCP);
-    clients=new gwClientPtr[maxClients];
-    for (int i=0;i<maxClients;i++){
-        clients[i]=gwClientPtr(new GwClient(wiFiClientPtr(NULL),logger,i,allowReceive));
-    }
-    server=new WiFiServer(config->getInt(config->serverPort),maxClients+1);
-    server->begin();
-    LOG_DEBUG(GwLog::LOG,"Socket server created, port=%d",
-        config->getInt(config->serverPort));
-    MDNS.addService("_nmea-0183","_tcp",config->getInt(config->serverPort));    
-
-}
-void GwSocketServer::loop(bool handleRead,bool handleWrite)
+class GwTcpClient
 {
-    if (! clients) return;
-    WiFiClient client = server->available(); // listen for incoming clients
+    GwClient *gwClient = NULL;
+    IPAddress remoteAddress;
+    uint16_t port = 0;
+    GwLog *logger;
 
-    if (client)
+public:
+    typedef enum
     {
-        LOG_DEBUG(GwLog::LOG,"new client connected from %s",
-                          client.remoteIP().toString().c_str());
-        fcntl(client.fd(), F_SETFL, O_NONBLOCK);
+        C_DISABLED = 0,
+        C_INITIALIZED = 1,
+        C_CONNECTING = 2,
+        C_CONNECTED = 3
+    } State;
+
+private:
+    State state = C_DISABLED;
+    void stop()
+    {
+        if (gwClient->hasClient())
+        {
+            LOG_DEBUG(GwLog::DEBUG, "stopping tcp client");
+            gwClient->stop();
+        }
+        state = C_DISABLED;
+    }
+    void startConnection()
+    {
+        //TODO
+        state = C_CONNECTING;
+    }
+    void checkConnection()
+    {
+    }
+
+public:
+    GwTcpClient(GwLog *logger, GwClient *gwClient)
+    {
+        this->logger = logger;
+        this->gwClient = gwClient;
+    }
+    void begin(IPAddress address, uint16_t port)
+    {
+        stop();
+        this->remoteAddress = address;
+        this->port = port;
+        state = C_INITIALIZED;
+        startConnection();
+    }
+    void loop()
+    {
+        if (state == C_CONNECTING)
+        {
+            checkConnection();
+        }
+    }
+};
+
+GwSocketServer::GwSocketServer(const GwConfigHandler *config, GwLog *logger, int minId)
+{
+    this->config = config;
+    this->logger = logger;
+    this->minId = minId;
+    maxClients = 1;
+    allowReceive = false;
+}
+bool GwSocketServer::createListener()
+{
+    struct sockaddr_in server;
+    listener = socket(AF_INET, SOCK_STREAM, 0);
+    if (listener < 0)
+    {
+        return false;
+    }
+    int enable = 1;
+    setsockopt(listener, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
+    server.sin_family = AF_INET;
+    server.sin_addr.s_addr = INADDR_ANY;
+    server.sin_port = htons(listenerPort);
+    if (bind(listener, (struct sockaddr *)&server, sizeof(server)) < 0)
+        return false;
+    if (listen(listener, maxClients) < 0)
+        return false;
+    fcntl(listener, F_SETFL, O_NONBLOCK);
+    return true;
+}
+void GwSocketServer::begin()
+{
+    maxClients = config->getInt(config->maxClients);
+    allowReceive = config->getBool(config->readTCP);
+    listenerPort=config->getInt(config->serverPort);
+    clients = new GwClient*[maxClients];
+    for (int i = 0; i < maxClients; i++)
+    {
+        clients[i] = new GwClient(logger, i, allowReceive);
+    }
+    if (! createListener()){
+        listener=-1;
+        LOG_DEBUG(GwLog::ERROR,"Unable to create listener");
+        return;
+    }
+    LOG_DEBUG(GwLog::LOG, "Socket server created, port=%d",
+              config->getInt(config->serverPort));
+    MDNS.addService("_nmea-0183", "_tcp", config->getInt(config->serverPort));
+}
+int GwSocketServer::available()
+{
+    if (listener < 0)
+        return -1;
+    int client_sock;
+    struct sockaddr_in _client;
+    int cs = sizeof(struct sockaddr_in);
+    client_sock = lwip_accept_r(listener, (struct sockaddr *)&_client, (socklen_t *)&cs);
+    if (client_sock >= 0)
+    {
+        int val = 1;
+        if (setsockopt(client_sock, SOL_SOCKET, SO_KEEPALIVE, (char *)&val, sizeof(int)) == ESP_OK)
+        {
+            if (setsockopt(client_sock, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(int)) == ESP_OK)
+                fcntl(client_sock, F_SETFL, O_NONBLOCK);
+                return client_sock;
+        }
+        close(client_sock);
+    }
+    return -1;
+}
+void GwSocketServer::loop(bool handleRead, bool handleWrite)
+{
+    if (!clients)
+        return;
+    int client = available(); // listen for incoming clients
+    if (client >= 0)
+    {
+        LOG_DEBUG(GwLog::LOG, "new client connected from %s",
+                  GwClient::remoteIP(client).toString().c_str());
         bool canHandle = false;
         for (int i = 0; i < maxClients; i++)
         {
             if (!clients[i]->hasClient())
             {
-                clients[i]->setClient(wiFiClientPtr(new WiFiClient(client)));
-                LOG_DEBUG(GwLog::LOG,"set client as number %d", i);
+                clients[i]->setClient(client);
+                LOG_DEBUG(GwLog::LOG, "set client as number %d", i);
                 canHandle = true;
                 break;
             }
@@ -192,7 +383,7 @@ void GwSocketServer::loop(bool handleRead,bool handleWrite)
         if (!canHandle)
         {
             logger->logDebug(GwLog::ERROR, "no space to store client, disconnect");
-            client.stop();
+            close(client);
         }
     }
     if (handleWrite)
@@ -200,69 +391,83 @@ void GwSocketServer::loop(bool handleRead,bool handleWrite)
         //sending
         for (int i = 0; i < maxClients; i++)
         {
-            gwClientPtr client = clients[i];
+            GwClient *client = clients[i];
             if (!client->hasClient())
                 continue;
             GwBuffer::WriteStatus rt = client->write();
             if (rt == GwBuffer::ERROR)
             {
-                LOG_DEBUG(GwLog::ERROR, "write error on %s, closing", client->remoteIp.c_str());
-                client->client->stop();
+                LOG_DEBUG(GwLog::ERROR, "write error on %s, closing", client->remoteIpAddress.c_str());
+                client->stop();
             }
         }
     }
     for (int i = 0; i < maxClients; i++)
     {
-        gwClientPtr client = clients[i];
+        GwClient *client = clients[i];
         if (!client->hasClient())
             continue;
 
-        if (!client->client->connected())
+        if (!client->connected())
         {
-            LOG_DEBUG(GwLog::LOG,"client %d disconnect %s", i, client->remoteIp.c_str());
-            client->client->stop();
-            client->setClient(NULL);
+            LOG_DEBUG(GwLog::LOG, "client %d disconnect %s", i, client->remoteIpAddress.c_str());
+            client->stop();
         }
         else
         {
-            if (handleRead) client->read();
+            if (handleRead)
+                client->read();
         }
     }
 }
 
-bool GwSocketServer::readMessages(GwMessageFetcher *writer){
-    if (! allowReceive || ! clients) return false;
-    bool hasMessages=false;
-    for (int i = 0; i < maxClients; i++){
-        writer->id=minId+i;
-        if (!clients[i]->hasClient()) continue;
-        if (clients[i]->messagesFromBuffer(writer)) hasMessages=true;
+bool GwSocketServer::readMessages(GwMessageFetcher *writer)
+{
+    if (!allowReceive || !clients)
+        return false;
+    bool hasMessages = false;
+    for (int i = 0; i < maxClients; i++)
+    {
+        writer->id = minId + i;
+        if (!clients[i]->hasClient())
+            continue;
+        if (clients[i]->messagesFromBuffer(writer))
+            hasMessages = true;
     }
     return hasMessages;
 }
-void GwSocketServer::sendToClients(const char *buf,int source){
-    if (! clients) return;
-    int len=strlen(buf);
-    int sourceIndex=source-minId;
+void GwSocketServer::sendToClients(const char *buf, int source)
+{
+    if (!clients)
+        return;
+    int len = strlen(buf);
+    int sourceIndex = source - minId;
     for (int i = 0; i < maxClients; i++)
     {
-        if (i == sourceIndex)continue; //never send out to the source we received from
-        gwClientPtr client = clients[i];
-        if (! client->hasClient()) continue;
-        if ( client->client->connected() ) {
-            client->enqueue((uint8_t*)buf,len);
+        if (i == sourceIndex)
+            continue; //never send out to the source we received from
+        GwClient *client = clients[i];
+        if (!client->hasClient())
+            continue;
+        if (client->connected())
+        {
+            client->enqueue((uint8_t *)buf, len);
         }
     }
 }
 
-int GwSocketServer::numClients(){
-    if (! clients) return 0;
-    int num=0;
-    for (int i = 0; i < maxClients; i++){
-        if (clients[i]->hasClient()) num++;
+int GwSocketServer::numClients()
+{
+    if (!clients)
+        return 0;
+    int num = 0;
+    for (int i = 0; i < maxClients; i++)
+    {
+        if (clients[i]->hasClient())
+            num++;
     }
     return num;
 }
-GwSocketServer::~GwSocketServer(){
-
+GwSocketServer::~GwSocketServer()
+{
 }
\ No newline at end of file
diff --git a/lib/socketserver/GwSocketServer.h b/lib/socketserver/GwSocketServer.h
index 33761d3..3dd57e4 100644
--- a/lib/socketserver/GwSocketServer.h
+++ b/lib/socketserver/GwSocketServer.h
@@ -6,18 +6,19 @@
 #include <memory>
 #include <WiFi.h>
 
-using wiFiClientPtr = std::shared_ptr<WiFiClient>;
 class GwClient;
-using gwClientPtr = std::shared_ptr<GwClient>;
 class GwSocketServer{
     private:
         const GwConfigHandler *config;
         GwLog *logger;
-        gwClientPtr *clients=NULL;
-        WiFiServer *server=NULL;
+        GwClient **clients=NULL;
+        int listener=-1;
+        int listenerPort=-1;
         bool allowReceive;
         int maxClients;
         int minId;
+        bool createListener();
+        int available();
     public:
         GwSocketServer(const GwConfigHandler *config,GwLog *logger,int minId);
         ~GwSocketServer();