diff --git a/src/client/cmds.qc b/src/client/cmds.qc
index 375a002..106d556 100644
--- a/src/client/cmds.qc
+++ b/src/client/cmds.qc
@@ -34,7 +34,7 @@ ClientGame_ConsoleCommand(void)
 		Textmenu_Toggle("RADIOC");
 		break;
 	case "nightvision":
-		/*Nightvision_Toggle();*/
+		Nightvision_Toggle();
 		break;
 	case "drop":
 		sendevent("DropWeapon", "");
diff --git a/src/client/defs.h b/src/client/defs.h
index c29e4d5..f73ae3d 100644
--- a/src/client/defs.h
+++ b/src/client/defs.h
@@ -146,6 +146,7 @@ struct
 	int m_iTimeUnitsOld;
 	float m_flTimeAlpha;
 	vector m_vecMoneyColor;
+	int m_iNightvision;
 } g_seats[4], *pSeat;
 
 void HUD_DrawAmmo1(void);
diff --git a/src/client/predict.qc b/src/client/draw.qc
similarity index 61%
rename from src/client/predict.qc
rename to src/client/draw.qc
index 7dabe8f..5721c28 100644
--- a/src/client/predict.qc
+++ b/src/client/draw.qc
@@ -14,30 +14,14 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
-=================
-Predict_PreFrame
-
-We're part way through parsing new player data.
-Propagate our pmove state to whatever the current frame before its stomped on 
-(so any non-networked state updates locally).
-=================
-*/
 void
-GamePredict_PreFrame(player pl)
+ClientGame_PreDraw(void) 
 {
+
 }
 
-/*
-=================
-Predict_PostFrame
-
-We're part way through parsing new player data.
-Rewind our pmove state back to before we started predicting. 
-(to give consistent state instead of accumulating errors)
-=================
-*/
 void
-GamePredict_PostFrame(player pl)
+ClientGame_PostDraw(void)
 {
+
 }
diff --git a/src/client/nightvision.qc b/src/client/nightvision.qc
new file mode 100644
index 0000000..791f24e
--- /dev/null
+++ b/src/client/nightvision.qc
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016-2021 Marco Hladik <marco@icculus.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+void
+Nightvision_Toggle(void)
+{
+	pSeat->m_iNightvision = 1 - pSeat->m_iNightvision;
+}
+
+void
+Nightvision_PreFrame(void)
+{
+	if (!pSeat->m_iNightvision)
+		return;
+
+	
+}
+
+void
+Nightvision_PostFrame(void)
+{
+	if (!pSeat->m_iNightvision)
+		return;
+}
diff --git a/src/client/progs.src b/src/client/progs.src
index a7735e4..f930c5e 100644
--- a/src/client/progs.src
+++ b/src/client/progs.src
@@ -1,6 +1,5 @@
 #pragma target fte
 #pragma progs_dat  "../../csprogs.dat"
-#pragma includedir "../../../valve/src"
 
 #define CSQC
 #define CLIENT
@@ -20,7 +19,8 @@ defs.h
 ../../../src/gs-entbase/shared.src
 ../shared/include.src
 
-predict.qc
+nightvision.qc
+draw.qc
 textmenu.qc
 init.qc
 player.qc