diff --git a/bin-int/Debug-x64/GLFW/GLFW.lib.recipe b/bin-int/Debug-x64/GLFW/GLFW.lib.recipe
new file mode 100644
index 00000000..a53f9611
--- /dev/null
+++ b/bin-int/Debug-x64/GLFW/GLFW.lib.recipe
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ProjectOutputs />
+  <ContentFiles />
+  <SatelliteDlls />
+  <NonRecipeFileRefs />
+</Project>
\ No newline at end of file
diff --git a/bin/Debug-x64/GLFW/GLFW.lib b/bin/Debug-x64/GLFW/GLFW.lib
index 91ca1f92..f93fc08b 100644
Binary files a/bin/Debug-x64/GLFW/GLFW.lib and b/bin/Debug-x64/GLFW/GLFW.lib differ
diff --git a/bin/Debug-x64/GLFW/GLFW.pdb b/bin/Debug-x64/GLFW/GLFW.pdb
index d1ab39bc..eeaf7956 100644
Binary files a/bin/Debug-x64/GLFW/GLFW.pdb and b/bin/Debug-x64/GLFW/GLFW.pdb differ
diff --git a/obj/Debug-x64/GLFW/GLFW.log b/obj/Debug-x64/GLFW/GLFW.log
index 94e5d991..9931f440 100644
--- a/obj/Debug-x64/GLFW/GLFW.log
+++ b/obj/Debug-x64/GLFW/GLFW.log
@@ -1,18 +1,25 @@
-cl : command line  warning D9002: ignoring unknown option '-std=c11'
-cl : command line  warning D9002: ignoring unknown option '-lgdi32'
-  context.c
+  context.c
   egl_context.c
   init.c
+  input.c
   monitor.c
+  null_init.c
+  null_joystick.c
+  null_monitor.c
+  null_window.c
   osmesa_context.c
+  platform.c
   vulkan.c
   wgl_context.c
   win32_init.c
   win32_joystick.c
+  win32_module.c
   win32_monitor.c
   win32_thread.c
   win32_time.c
   win32_window.c
+  Generating Code...
+  Compiling...
   window.c
   Generating Code...
   GLFW.vcxproj -> C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\bin\Debug-x64\GLFW\GLFW.lib
diff --git a/obj/Debug-x64/GLFW/GLFW.tlog/CL.command.1.tlog b/obj/Debug-x64/GLFW/GLFW.tlog/CL.command.1.tlog
index bc8ef319..c1a57692 100644
Binary files a/obj/Debug-x64/GLFW/GLFW.tlog/CL.command.1.tlog and b/obj/Debug-x64/GLFW/GLFW.tlog/CL.command.1.tlog differ
diff --git a/obj/Debug-x64/GLFW/GLFW.tlog/CL.read.1.tlog b/obj/Debug-x64/GLFW/GLFW.tlog/CL.read.1.tlog
index da8ef05e..982a9ae6 100644
Binary files a/obj/Debug-x64/GLFW/GLFW.tlog/CL.read.1.tlog and b/obj/Debug-x64/GLFW/GLFW.tlog/CL.read.1.tlog differ
diff --git a/obj/Debug-x64/GLFW/GLFW.tlog/CL.write.1.tlog b/obj/Debug-x64/GLFW/GLFW.tlog/CL.write.1.tlog
index 467246f6..8c3f01b6 100644
Binary files a/obj/Debug-x64/GLFW/GLFW.tlog/CL.write.1.tlog and b/obj/Debug-x64/GLFW/GLFW.tlog/CL.write.1.tlog differ
diff --git a/obj/Debug-x64/GLFW/GLFW.tlog/Cl.items.tlog b/obj/Debug-x64/GLFW/GLFW.tlog/Cl.items.tlog
index 1335ea75..aaa838e6 100644
--- a/obj/Debug-x64/GLFW/GLFW.tlog/Cl.items.tlog
+++ b/obj/Debug-x64/GLFW/GLFW.tlog/Cl.items.tlog
@@ -1,12 +1,19 @@
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\context.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\context.obj
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\egl_context.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\egl_context.obj
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\init.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\init.obj
+C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\input.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\input.obj
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\monitor.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\monitor.obj
+C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\null_init.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\null_init.obj
+C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\null_joystick.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\null_joystick.obj
+C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\null_monitor.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\null_monitor.obj
+C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\null_window.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\null_window.obj
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\osmesa_context.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\osmesa_context.obj
+C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\platform.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\platform.obj
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\vulkan.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\vulkan.obj
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\wgl_context.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\wgl_context.obj
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\win32_init.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\win32_init.obj
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\win32_joystick.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\win32_joystick.obj
+C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\win32_module.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\win32_module.obj
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\win32_monitor.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\win32_monitor.obj
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\win32_thread.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\win32_thread.obj
 C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\src\win32_time.c;C:\Users\Harman\Documents\C++\Pulse\Pulse\vendor\GLFW\obj\Debug-x64\GLFW\win32_time.obj
diff --git a/obj/Debug-x64/GLFW/GLFW.tlog/Lib-link.read.1.tlog b/obj/Debug-x64/GLFW/GLFW.tlog/Lib-link.read.1.tlog
index f097bbdd..4acb6363 100644
Binary files a/obj/Debug-x64/GLFW/GLFW.tlog/Lib-link.read.1.tlog and b/obj/Debug-x64/GLFW/GLFW.tlog/Lib-link.read.1.tlog differ
diff --git a/obj/Debug-x64/GLFW/GLFW.tlog/Lib-link.write.1.tlog b/obj/Debug-x64/GLFW/GLFW.tlog/Lib-link.write.1.tlog
index 58caf13d..a24fa9c8 100644
Binary files a/obj/Debug-x64/GLFW/GLFW.tlog/Lib-link.write.1.tlog and b/obj/Debug-x64/GLFW/GLFW.tlog/Lib-link.write.1.tlog differ
diff --git a/obj/Debug-x64/GLFW/GLFW.tlog/Lib.command.1.tlog b/obj/Debug-x64/GLFW/GLFW.tlog/Lib.command.1.tlog
index bebeda63..048c122b 100644
Binary files a/obj/Debug-x64/GLFW/GLFW.tlog/Lib.command.1.tlog and b/obj/Debug-x64/GLFW/GLFW.tlog/Lib.command.1.tlog differ
diff --git a/obj/Debug-x64/GLFW/context.obj b/obj/Debug-x64/GLFW/context.obj
index 5332b571..3b7f7ef4 100644
Binary files a/obj/Debug-x64/GLFW/context.obj and b/obj/Debug-x64/GLFW/context.obj differ
diff --git a/obj/Debug-x64/GLFW/egl_context.obj b/obj/Debug-x64/GLFW/egl_context.obj
index 813d12f0..8f831b49 100644
Binary files a/obj/Debug-x64/GLFW/egl_context.obj and b/obj/Debug-x64/GLFW/egl_context.obj differ
diff --git a/obj/Debug-x64/GLFW/init.obj b/obj/Debug-x64/GLFW/init.obj
index abb707fd..effaa1b1 100644
Binary files a/obj/Debug-x64/GLFW/init.obj and b/obj/Debug-x64/GLFW/init.obj differ
diff --git a/obj/Debug-x64/GLFW/monitor.obj b/obj/Debug-x64/GLFW/monitor.obj
index d196778f..8b1defd9 100644
Binary files a/obj/Debug-x64/GLFW/monitor.obj and b/obj/Debug-x64/GLFW/monitor.obj differ
diff --git a/obj/Debug-x64/GLFW/osmesa_context.obj b/obj/Debug-x64/GLFW/osmesa_context.obj
index 73481565..587c2057 100644
Binary files a/obj/Debug-x64/GLFW/osmesa_context.obj and b/obj/Debug-x64/GLFW/osmesa_context.obj differ
diff --git a/obj/Debug-x64/GLFW/vulkan.obj b/obj/Debug-x64/GLFW/vulkan.obj
index 484a9997..0e39cfca 100644
Binary files a/obj/Debug-x64/GLFW/vulkan.obj and b/obj/Debug-x64/GLFW/vulkan.obj differ
diff --git a/obj/Debug-x64/GLFW/wgl_context.obj b/obj/Debug-x64/GLFW/wgl_context.obj
index e60ac6a7..8316e3fe 100644
Binary files a/obj/Debug-x64/GLFW/wgl_context.obj and b/obj/Debug-x64/GLFW/wgl_context.obj differ
diff --git a/obj/Debug-x64/GLFW/win32_init.obj b/obj/Debug-x64/GLFW/win32_init.obj
index e8c0044c..2ad8a6b1 100644
Binary files a/obj/Debug-x64/GLFW/win32_init.obj and b/obj/Debug-x64/GLFW/win32_init.obj differ
diff --git a/obj/Debug-x64/GLFW/win32_joystick.obj b/obj/Debug-x64/GLFW/win32_joystick.obj
index 98b63f4e..8c5db624 100644
Binary files a/obj/Debug-x64/GLFW/win32_joystick.obj and b/obj/Debug-x64/GLFW/win32_joystick.obj differ
diff --git a/obj/Debug-x64/GLFW/win32_monitor.obj b/obj/Debug-x64/GLFW/win32_monitor.obj
index e34c355a..f186c726 100644
Binary files a/obj/Debug-x64/GLFW/win32_monitor.obj and b/obj/Debug-x64/GLFW/win32_monitor.obj differ
diff --git a/obj/Debug-x64/GLFW/win32_thread.obj b/obj/Debug-x64/GLFW/win32_thread.obj
index 6109d635..8c00350c 100644
Binary files a/obj/Debug-x64/GLFW/win32_thread.obj and b/obj/Debug-x64/GLFW/win32_thread.obj differ
diff --git a/obj/Debug-x64/GLFW/win32_time.obj b/obj/Debug-x64/GLFW/win32_time.obj
index ce0e14a9..b18d5595 100644
Binary files a/obj/Debug-x64/GLFW/win32_time.obj and b/obj/Debug-x64/GLFW/win32_time.obj differ
diff --git a/obj/Debug-x64/GLFW/win32_window.obj b/obj/Debug-x64/GLFW/win32_window.obj
index 78c51cc3..7319cad7 100644
Binary files a/obj/Debug-x64/GLFW/win32_window.obj and b/obj/Debug-x64/GLFW/win32_window.obj differ
diff --git a/obj/Debug-x64/GLFW/window.obj b/obj/Debug-x64/GLFW/window.obj
index 6e837d17..aa282c59 100644
Binary files a/obj/Debug-x64/GLFW/window.obj and b/obj/Debug-x64/GLFW/window.obj differ
diff --git a/premake5.lua b/premake5.lua
index 05c1fb4b..944f21b2 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -3,44 +3,51 @@ project "GLFW"
 	language "C"
 		
 		targetdir ("bin/" .. outputdir .. "/%{prj.name}")
-		objdir ("obj/" .. outputdir .. "/%{prj.name}")
-
-		test = "bin/" .. outputdir .. "/%{prj.name}"
-		print(test)
-		files
+		objdir ("obj/" .. outputdir .. "/%{prj.name}")
+		
+		files
 		{
 			"include/GLFW/glfw3.h",
 			"include/GLFW/glfw3native.h",
 			"src/glfw_config.h",
 			"src/context.c",
 			"src/init.c",
+			"src/input.c",
 			"src/monitor.c",
+
+			"src/null_init.c",
+			"src/null_joystick.c",
+			"src/null_monitor.c",
+			"src/null_window.c",
+
+			"src/platform.c",
 			"src/vulkan.c",
-			"src/window.c"
+			"src/window.c",
 		}
 
-		filter "system:windows"
-		buildoptions {"-std=c11", "-lgdi32"}
-		systemversion "latest"
-		staticruntime "On"
+		filter "system:windows"			
+			systemversion "latest"
+			staticruntime "On"
 
-		files
-		{
-			"src/win32_init.c",
-			"src/win32_joystick.c",
-			"src/win32_monitor.c",
-			"src/win32_time.c",
-			"src/win32_thread.c",
-			"src/win32_window.c",
-			"src/wgl_context.c",
-			"src/egl_context.c",
-			"src/osmesa_context.c"
-		}
+			files
+			{
+				"src/win32_init.c",
+				"src/win32_joystick.c",
+				"src/win32_module.c",
+				"src/win32_monitor.c",
+				"src/win32_time.c",
+				"src/win32_thread.c",
+				"src/win32_window.c",
+				"src/wgl_context.c",
+				"src/egl_context.c",
+				"src/osmesa_context.c"
+			}
 
-		defines{
-		"_GLFW_WIN32",
-		"_CRT_SECURE_NO_WARNINGS"
-		}
+			defines
+			{
+				"_GLFW_WIN32",
+				"_CRT_SECURE_NO_WARNINGS"
+			}
 
 		filter { "system:windows","configurations:Release"}
 		buildoptions "/MT"