diff --git a/software/source/clients/windows/__init__.py b/software/source/clients/windows/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/software/source/clients/windows/device.py b/software/source/clients/windows/device.py
new file mode 100644
index 0000000..a9a79c0
--- /dev/null
+++ b/software/source/clients/windows/device.py
@@ -0,0 +1,10 @@
+from ..base_device import Device
+
+device = Device()
+
+def main(server_url):
+    device.server_url = server_url
+    device.start()
+
+if __name__ == "__main__":
+    main()
diff --git a/software/start.py b/software/start.py
index 70088e4..a93a488 100644
--- a/software/start.py
+++ b/software/start.py
@@ -65,7 +65,7 @@ def run(
 def _run(
             server: bool = False,
             server_host: str = "0.0.0.0",
-            server_port: int = 10001,
+            server_port: int = 3000,
             
             tunnel_service: str = "bore",
             expose: bool = False,
@@ -123,6 +123,8 @@ def _run(
             system_type = platform.system()
             if system_type == "Darwin":  # Mac OS
                 client_type = "mac"
+            elif system_type == "Windows":  # Windows System
+                client_type = "windows"
             elif system_type == "Linux":  # Linux System
                 try:
                     with open('/proc/device-tree/model', 'r') as m: