diff --git a/include/wifi_clients.h b/include/wifi_clients.h
new file mode 100644
index 0000000..18487e7
--- /dev/null
+++ b/include/wifi_clients.h
@@ -0,0 +1,13 @@
+//
+// Created by Admin on 11.06.2021.
+//
+
+#ifndef TTGO_T_BEAM_LORA_APRS_WIFI_CLIENTS_H
+#define TTGO_T_BEAM_LORA_APRS_WIFI_CLIENTS_H
+#include <WiFiClient.h>
+#include <WiFiServer.h>
+
+typedef void (*f_connectedClientCallback_t) (WiFiClient *, int, const String *);
+void iterateWifiClients(f_connectedClientCallback_t callback, const String *data, WiFiClient * wifiClients[], int maxWifiClients);
+void check_for_new_clients(WiFiServer *wiFiServer, WiFiClient * wifiClients[], int maxWifiClients);
+#endif //TTGO_T_BEAM_LORA_APRS_WIFI_CLIENTS_H
diff --git a/src/wifi_clients.cpp b/src/wifi_clients.cpp
new file mode 100644
index 0000000..8993a11
--- /dev/null
+++ b/src/wifi_clients.cpp
@@ -0,0 +1,64 @@
+//
+// Created by Admin on 11.06.2021.
+//
+
+#ifdef ENABLE_WIFI
+
+#include <wifi_clients.h>
+
+#include "wifi_clients.h"
+
+void iterateWifiClients(f_connectedClientCallback_t callback, const String *data, WiFiClient * wifiClients[], int maxWifiClients){
+  for (int i=0; i < maxWifiClients; i++) {
+    auto client = wifiClients[i];
+    if (client != nullptr) {
+      if (client->connected()) {
+        callback(client, i, data);
+      } else {
+        #ifdef ENABLE_WIFI_CLIENT_DEBUG
+        Serial.println(String("Disconnected client ") + client->remoteIP().toString() + ":" + client->remotePort());
+        #endif
+        delete client;
+        wifiClients[i] = nullptr;
+      }
+    }
+  }
+}
+
+void check_for_new_clients(WiFiServer *wiFiServer, WiFiClient *wifiClients[], int maxWifiClients) {
+  WiFiClient new_client = wiFiServer->available();
+  if (new_client.connected()){
+    bool new_client_handled = false;
+    for (int i=0; i < maxWifiClients; i++) {
+      auto client = wifiClients[i];
+      if (client == nullptr) {
+        client = new WiFiClient(new_client);
+        wifiClients[i] = client;
+        new_client_handled = true;
+        #ifdef ENABLE_WIFI_CLIENT_DEBUG
+        Serial.println(String("New client #") +String(i) + ": " + client->remoteIP().toString() + ":" + client->remotePort());
+        #endif
+        break;
+      }
+    }
+    #ifdef ENABLE_WIFI_CLIENT_DEBUG
+    for (int i = 0; i < maxWifiClients; ++i) {
+            auto client = clients[i];
+
+            if (client != nullptr){
+              Serial.println(String("Client #") +String(i) + ": " + client->remoteIP().toString() + ":" + client->remotePort());
+            }
+          }
+    #endif
+
+
+    if (!new_client_handled){
+      #ifdef ENABLE_WIFI_CLIENT_DEBUG
+      Serial.println(String("Refusing client "));
+      #endif
+      new_client.stop();
+    }
+  }
+}
+
+#endif