diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b5cf80..c4fc4b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,12 +132,12 @@ set(EHS_SOURCES
     include/ehs/io/socket/TCP.h
     src/io/socket/SSL.cpp include/ehs/io/socket/SSL.h
 
-        include/ehs/io/socket/ehc/NetUtils.h
-        src/io/socket/EHC.cpp include/ehs/io/socket/EHC.h
-        src/io/socket/ehc/NetFrag.cpp include/ehs/io/socket/ehc/NetFrag.h
-        src/io/socket/ehc/NetEnd.cpp include/ehs/io/socket/ehc/NetEnd.h
-        src/io/socket/ehc/NetSys.cpp include/ehs/io/socket/ehc/NetSys.h
-        src/io/socket/ehc/NetOp.cpp include/ehs/io/socket/ehc/NetOp.h
+    include/ehs/io/socket/ehc/NetUtils.h
+    src/io/socket/EHC.cpp include/ehs/io/socket/EHC.h
+    src/io/socket/ehc/NetFrag.cpp include/ehs/io/socket/ehc/NetFrag.h
+    src/io/socket/ehc/NetEnd.cpp include/ehs/io/socket/ehc/NetEnd.h
+    src/io/socket/ehc/NetSys.cpp include/ehs/io/socket/ehc/NetSys.h
+    src/io/socket/ehc/NetOp.cpp include/ehs/io/socket/ehc/NetOp.h
 
     src/io/socket/rest/Twitch.cpp include/ehs/io/socket/rest/Twitch.h
     src/io/socket/rest/TwitchChat.cpp include/ehs/io/socket/rest/TwitchChat.h
@@ -214,7 +214,10 @@ if (IS_OS_WINDOWS)
         src/io/COM.cpp include/ehs/io/COM.h
         src/system/CPU_MSVC_AMD64.asm src/HRNG_MSVC.asm src/Math_MSVC_AMD64.asm
         src/io/Directory_W32.cpp include/ehs/io/Directory_W32.h
+        include/ehs/io/socket/ICMP_W32.h src/io/socket/ICMP_W32.cpp
     )
+
+    add_link_options(-fno-exceptions -fno-rtti)
 elseif (IS_OS_LINUX)
     list(APPEND EHS_SOURCES
         src/io/socket/UDP_BSD.cpp include/ehs/io/socket/UDP_BSD.h
@@ -234,6 +237,8 @@ elseif (IS_OS_LINUX)
         include/ehs/io/socket/ICMP_LNX.h src/io/socket/ICMP_LNX.cpp
     )
 
+    add_compile_options(/EHs- /GR-)
+
     #set(LINUX_WINDOW_SYSTEM "Wayland" CACHE STRING "Linux Window System")
 
     if (LINUX_WINDOW_SYSTEM STREQUAL "Wayland")
diff --git a/include/ehs/io/socket/ICMP_W32.h b/include/ehs/io/socket/ICMP_W32.h
new file mode 100644
index 0000000..74cdff8
--- /dev/null
+++ b/include/ehs/io/socket/ICMP_W32.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "BaseICMP.h"
+
+namespace ehs
+{
+	class ICMP : public virtual BaseICMP
+	{
+    };
+}
\ No newline at end of file
diff --git a/src/io/socket/ICMP_W32.cpp b/src/io/socket/ICMP_W32.cpp
new file mode 100644
index 0000000..b88c2bc
--- /dev/null
+++ b/src/io/socket/ICMP_W32.cpp
@@ -0,0 +1,3 @@
+//
+// Created by Arron Nelson on 3/26/2025.
+//
diff --git a/src/system/CPU_ARM64.cpp b/src/system/CPU_ARM64.cpp
index cf09004..ba140bf 100644
--- a/src/system/CPU_ARM64.cpp
+++ b/src/system/CPU_ARM64.cpp
@@ -43,4 +43,9 @@ namespace ehs
 	void CPU::GetBrand(Char_8* input)
 	{
 	}
+
+    UInt_8 CPU::GetCacheLineSize()
+    {
+      return 0;
+    }
 }
\ No newline at end of file