diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..582f88d41
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "mp/src/thirdparty/gason"]
+	path = mp/src/thirdparty/gason
+	url = https://github.com/vivkin/gason
diff --git a/CONTRIBUTING b/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING
rename to CONTRIBUTING.md
diff --git a/README b/README
deleted file mode 100644
index 3ade2f320..000000000
--- a/README
+++ /dev/null
@@ -1,43 +0,0 @@
-               SOURCE 1 SDK LICENSE
-
-Source SDK Copyright(c) Valve Corp.  
-
-THIS DOCUMENT DESCRIBES A CONTRACT BETWEEN YOU AND VALVE 
-CORPORATION ("Valve").  PLEASE READ IT BEFORE DOWNLOADING OR USING 
-THE SOURCE ENGINE SDK ("SDK"). BY DOWNLOADING AND/OR USING THE 
-SOURCE ENGINE SDK YOU ACCEPT THIS LICENSE. IF YOU DO NOT AGREE TO 
-THE TERMS OF THIS LICENSE PLEASE DON’T DOWNLOAD OR USE THE SDK.  
-
-  You may, free of charge, download and use the SDK to develop a modified Valve game 
-running on the Source engine.  You may distribute your modified Valve game in source and 
-object code form, but only for free. Terms of use for Valve games are found in the Steam 
-Subscriber Agreement located here: http://store.steampowered.com/subscriber_agreement/ 
-
-  You may copy, modify, and distribute the SDK and any modifications you make to the 
-SDK in source and object code form, but only for free.  Any distribution of this SDK must 
-include this LICENSE file and thirdpartylegalnotices.txt.  
- 
-  Any distribution of the SDK or a substantial portion of the SDK must include the above 
-copyright notice and the following: 
-
-    DISCLAIMER OF WARRANTIES.  THE SOURCE SDK AND ANY 
-    OTHER MATERIAL DOWNLOADED BY LICENSEE IS PROVIDED 
-    "AS IS".  VALVE AND ITS SUPPLIERS DISCLAIM ALL 
-    WARRANTIES WITH RESPECT TO THE SDK, EITHER EXPRESS 
-    OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED 
-    WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT, 
-    TITLE AND FITNESS FOR A PARTICULAR PURPOSE.  
-
-    LIMITATION OF LIABILITY.  IN NO EVENT SHALL VALVE OR 
-    ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, 
-    INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER 
-    (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF 
-    BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF 
-    BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS) 
-    ARISING OUT OF THE USE OF OR INABILITY TO USE THE 
-    ENGINE AND/OR THE SDK, EVEN IF VALVE HAS BEEN 
-    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  
- 
-       
-If you would like to use the SDK for a commercial purpose, please contact Valve at 
-sourceengine@valvesoftware.com.
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..a99288ef1
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+# Momentum Mod
+
+Momentum Mod is a free stand-alone Source mod with Counter-Strike: Source physics
+dedicated to bhop and surfing while trying to improve them and simultaneously making
+it easier to access and play (offline and online) as well as being cheaper
+than any other Source game you'd have to buy to play either of these game modes.
+
+## Contributing
+
+You can read about how to contribute to the development of the mod
+at the [contributing](CONTRIBUTING.md) section
+
+You can find a (code focused) TO DO at [TODO.md](TODO.md), where you can see what we
+plan to do next or what we have in mind (But, as it is a development list, we may skip some
+of the ideas for whatever reason)
+
+
+## Contact
+You can contact us [at our website](http://momentum-mod.org/contact)
+
+<sub><sub>The licenses and legal notices can be found at [SDK LICENSE](LICENSE) and [THIRD PARTY LEGAL NOTICES](thirdpartylegalnotices.txt)</sub></sub>
+
diff --git a/TODO b/TODO.md
similarity index 100%
rename from TODO
rename to TODO.md
diff --git a/mp/src/createallprojects.bat b/mp/src/createallprojects.bat
index 40c0f22cb..026701089 100755
--- a/mp/src/createallprojects.bat
+++ b/mp/src/createallprojects.bat
@@ -1 +1,2 @@
 devtools\bin\vpc.exe /hl2mp +everything /mksln everything.sln
+PAUSE
\ No newline at end of file
diff --git a/mp/src/creategameprojects.bat b/mp/src/creategameprojects.bat
index 701170deb..563c9539b 100755
--- a/mp/src/creategameprojects.bat
+++ b/mp/src/creategameprojects.bat
@@ -1,3 +1,4 @@
-devtools\bin\vpc.exe /hl2 +game /mksln momentum.sln
+devtools\bin\vpc.exe /hl2mp +game /mksln momentum.sln
 copy momentum.sln+sln_fix.txt momentum.sln
-Powershell.exe -ExecutionPolicy Bypass -File creategameprojects.ps1
\ No newline at end of file
+Powershell.exe -ExecutionPolicy Bypass -File creategameprojects.ps1
+PAUSE
\ No newline at end of file
diff --git a/mp/src/game/client/client_hl2mp.vpc b/mp/src/game/client/client_hl2mp.vpc
index 88e18a8ec..dbfd6f602 100644
--- a/mp/src/game/client/client_hl2mp.vpc
+++ b/mp/src/game/client/client_hl2mp.vpc
@@ -6,7 +6,7 @@
 
 $Macro SRCDIR		"..\.."
 $Macro GAMENAME 	"hl2mp" [!$SOURCESDK]
-$Macro GAMENAME 	"mod_hl2mp" [$SOURCESDK]
+$Macro GAMENAME 	"momentum" [$SOURCESDK]
 
 $Include "$SRCDIR\game\client\client_base.vpc"
 
@@ -19,32 +19,131 @@ $Configuration
 	}
 }
 
-$Project "Client (HL2MP)"
+$Project "Client (Momentum)"
 {
 	$Folder	"Source Files"
 	{
-		-$File	"$SRCDIR\game\shared\weapon_parse_default.cpp"
-
+		$File	"hud_chat.cpp"
 		$File	"c_team_objectiveresource.cpp"
 		$File	"c_team_objectiveresource.h"
-		$File	"c_team_train_watcher.cpp"
-		$File	"c_team_train_watcher.h"
-		$File	"hud_voicestatus.cpp"
-		$File	"$SRCDIR\game\shared\predicted_viewmodel.cpp"
-		$File	"$SRCDIR\game\shared\predicted_viewmodel.h"
-		$File	"$SRCDIR\game\shared\teamplay_round_timer.cpp"
-		$File	"$SRCDIR\game\shared\teamplay_round_timer.h"
+
+		$Folder "Momentum"
+		{
+		    $Folder "UI"
+			{
+                $Folder "MapSelection"
+                {
+                    $Folder "Headers"
+                    {
+                        $File "momentum\ui\MapSelection\BaseMapsPage.h"
+                        $File "momentum\ui\MapSelection\IMapList.h"
+						$File "momentum\ui\MapSelection\IMapSelector.h"
+                        $File "momentum\ui\MapSelection\LocalMaps.h"
+                        $File "momentum\ui\MapSelection\MapContextMenu.h"
+                        $File "momentum\ui\MapSelection\MapInfoDialog.h"
+						$File "momentum\ui\MapSelection\MapSelector.h"
+                        $File "momentum\ui\MapSelection\MapSelectorDialog.h"
+                        $File "momentum\ui\MapSelection\OnlineMaps.h"
+                        $File "momentum\ui\MapSelection\pch_mapselection.h"
+                    }
+                    $File "momentum\ui\MapSelection\BaseMapsPage.cpp" \
+                          "momentum\ui\MapSelection\LocalMaps.cpp" \ 
+                          "momentum\ui\MapSelection\MapContextMenu.cpp" \
+                          "momentum\ui\MapSelection\MapInfoDialog.cpp" \ 
+						  "momentum\ui\MapSelection\MapSelector.cpp" \
+                          "momentum\ui\MapSelection\MapSelectorDialog.cpp" \
+                          "momentum\ui\MapSelection\OnlineMaps.cpp"
+                    {
+					    $Configuration
+					    {
+						    $Compiler
+						    {
+							    $Create/UsePrecompiledHeader	"Not Using Precompiled Headers"
+						    }
+					    }
+				    }
+                }          
+            
+			    $File	"momentum\ui\speedometer.cpp"
+			    $File   "momentum\ui\hud_cp_menu.cpp"
+			    $File   "momentum\ui\hud_cp_menu.h"
+				$File	"momentum\ui\timer.cpp"
+			}
+
+			$File	"momentum\client_events.h"
+
+			$File	"momentum\client_events.cpp"
+			{
+				$Configuration
+				{
+					$Compiler
+					{
+						$Create/UsePrecompiledHeader	"Not Using Precompiled Headers"
+					}
+				}
+			}
+
+			$Folder "Weapons"
+			{
+			    $File "$SRCDIR\game\shared\momentum\weapon_momentum_gun.cpp"
+				//MOM_TODO: Add the rest of the weapon files here
+				$File "$SRCDIR\game\shared\momentum\basecsgrenade_projectile.cpp"
+				$File "$SRCDIR\game\shared\momentum\basecsgrenade_projectile.h"
+				$File "$SRCDIR\game\shared\momentum\cs_ammodef.cpp"
+				$File "$SRCDIR\game\shared\momentum\cs_ammodef.h"
+				$File "$SRCDIR\game\shared\momentum\cs_playeranimstate.cpp"
+				$File "$SRCDIR\game\shared\momentum\cs_playeranimstate.h"
+				$File "$SRCDIR\game\shared\momentum\cs_weapon_parse.cpp"
+				$File "$SRCDIR\game\shared\momentum\cs_weapon_parse.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_csbase.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_csbase.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_csbasegun.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_csbasegun.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_cs_heavy.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_cs_pistols.cpp"
+                $File "$SRCDIR\game\shared\momentum\weapon_cs_rifles.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_cs_smgs.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_basecsgrenade.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_basecsgrenade.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_flashbang.h" 
+				$File "$SRCDIR\game\shared\momentum\weapon_flashbang.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_hegrenade.cpp" 
+				$File "$SRCDIR\game\shared\momentum\weapon_hegrenade.h" 
+				$File "$SRCDIR\game\shared\momentum\weapon_knife.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_knife.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_smokegrenade.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_smokegrenade.cpp"
+			}
+
+			$Folder "Util"
+			{
+			    $File "$SRCDIR\game\shared\momentum\util\mom_util.cpp"
+				$File "$SRCDIR\game\shared\momentum\util\mom_util.h"
+			}
+
+			$File   "$SRCDIR\game\shared\momentum\mom_gamemovement.cpp"
+			$File   "$SRCDIR\game\shared\momentum\mom_gamemovement.h"
+			$File   "$SRCDIR\game\shared\momentum\mom_player_shared.h"
+			$File   "$SRCDIR\game\shared\momentum\mom_player_shared.cpp"
+			$File   "$SRCDIR\game\shared\momentum\mom_gamerules.cpp"
+			$File   "$SRCDIR\game\shared\momentum\mom_usermessages.cpp"
+			$File   "$SRCDIR\game\shared\momentum\mom_gamerules.h"
+			$File   "$SRCDIR\game\shared\momentum\mom_shareddefs.h"
+			$File   "momentum\c_mom_player.cpp"
+			$File   "momentum\c_mom_player.h"
+			$File   "momentum\c_te_shotgun_shot.cpp"
+			$File   "momentum\fx_cs_impacts.cpp"
+			$File   "momentum\fx_cs_muzzleflash.cpp"
+			$File   "momentum\fx_cs_weaponfx.cpp"
+			$File   "$SRCDIR\game\shared\momentum\fx_cs_shared.h"
+			$File   "$SRCDIR\game\shared\momentum\fx_cs_shared.cpp"
+		}
 
 		$Folder	"HL2 DLL"
 		{
- 			$File	"episodic\c_vort_charge_token.cpp"
 			$File	"$SRCDIR\game\shared\hl2\basehlcombatweapon_shared.cpp"
-			$File	"hl2\c_antlion_dust.cpp"
+			$File	"$SRCDIR\game\shared\hl2\achievements_hl2.cpp"
 			$File	"hl2\c_ar2_explosion.cpp"
-			$File	"hl2\c_barnacle.cpp"
-			$File	"hl2\c_barney.cpp"
-			$File	"hl2\c_basehelicopter.cpp"
-			$File	"hl2\c_basehelicopter.h"
 			$File	"hl2\c_basehlcombatweapon.cpp"
 			$File	"hl2\c_basehlcombatweapon.h"
 			$File	"hl2\c_basehlplayer.cpp"
@@ -59,53 +158,38 @@ $Project "Client (HL2MP)"
 			$File	"hl2\c_hl2_playerlocaldata.cpp"
 			$File	"hl2\c_hl2_playerlocaldata.h"
 			$File	"hl2\c_info_teleporter_countdown.cpp"
-			$File	"hl2\c_npc_antlionguard.cpp"
-			$File	"hl2\c_npc_combinegunship.cpp"
-			$File	"hl2\c_npc_manhack.cpp"
-			$File	"hl2\c_npc_rollermine.cpp"
 			$File	"hl2\c_plasma_beam_node.cpp"
 			$File	"hl2\c_prop_combine_ball.cpp"
 			$File	"hl2\c_prop_combine_ball.h"
 			$File	"hl2\c_rotorwash.cpp"
 			$File	"hl2\c_script_intro.cpp"
 			$File	"$SRCDIR\game\shared\script_intro_shared.cpp"
-			$File	"hl2\c_strider.cpp"
 			$File	"hl2\c_te_concussiveexplosion.cpp"
 			$File	"hl2\c_te_flare.cpp"
-			$File	"hl2\c_thumper_dust.cpp"
-			$File	"hl2\c_vehicle_airboat.cpp"
-			$File	"hl2\c_vehicle_cannon.cpp"
-			$File	"hl2\c_vehicle_crane.cpp"
-			$File	"hl2\c_vehicle_crane.h"
-			$File	"hl2\c_vehicle_prisoner_pod.cpp"
 			$File	"hl2\c_weapon__stubs_hl2.cpp"
 			$File	"hl2\c_weapon_crossbow.cpp"
+			$File	"hl2\c_weapon_physcannon.cpp"
 			$File	"$SRCDIR\game\shared\hl2\citadel_effects_shared.h"
+			$File	"hl2\clientmode_hlnormal.cpp"
+			$File	"hl2\clientmode_hlnormal.h"
+			$File	"death.cpp"
 			$File	"$SRCDIR\game\shared\hl2\env_headcrabcanister_shared.cpp"
 			$File	"$SRCDIR\game\shared\hl2\env_headcrabcanister_shared.h"
-			$File	"hl2\fx_antlion.cpp"
-			$File	"hl2\fx_bugbait.cpp"
 			$File	"hl2\fx_hl2_impacts.cpp"
 			$File	"hl2\fx_hl2_tracers.cpp"
 			$File	"hl2\hl2_clientmode.cpp"
 			$File	"$SRCDIR\game\shared\hl2\hl2_gamerules.cpp"
 			$File	"$SRCDIR\game\shared\hl2\hl2_gamerules.h"
 			$File	"$SRCDIR\game\shared\hl2\hl2_shareddefs.h"
-			$File	"$SRCDIR\game\shared\hl2\hl2_usermessages.cpp"
-			$File	"$SRCDIR\game\shared\hl2\hl_gamemovement.cpp"
-			$File	"$SRCDIR\game\shared\hl2\hl_gamemovement.h"
 			$File	"hl2\hl_in_main.cpp"
 			$File	"hl2\hl_prediction.cpp"
 			$File	"hl2\hud_ammo.cpp"
-			$File	"hl2\hud_battery.cpp"
 			$File	"hl2\hud_blood.cpp"
 			$File	"hl2\hud_credits.cpp"
 			$File	"hl2\hud_damageindicator.cpp"
-			$File	"hl2\hud_flashlight.cpp"
 			$File	"hl2\hud_health.cpp"
 			$File	"hl2\hud_poisondamageindicator.cpp"
 			$File	"hl2\hud_quickinfo.cpp"
-			$File	"hud_squadstatus.cpp"
 			$File	"hl2\hud_suitpower.cpp"
 			$File	"hl2\hud_suitpower.h"
 			$File	"hl2\hud_weaponselection.cpp"
@@ -113,61 +197,19 @@ $Project "Client (HL2MP)"
 			$File	"hl2\shieldproxy.cpp"
 			$File	"hl2\vgui_rootpanel_hl2.cpp"
 		}
-
-		$Folder	"HL2MP"
+	}
+	$Folder	"JSON Parser"
+	{
+		$File "$SRCDIR\thirdparty\gason\src\gason.h"
+		$File "$SRCDIR\thirdparty\gason\src\gason.cpp"
 		{
-			$File	"hl2mp\c_hl2mp_player.cpp"
-			$File	"hl2mp\c_hl2mp_player.h"
-			$File	"hl2mp\c_te_hl2mp_shotgun_shot.cpp"
-			$File	"hl2mp\clientmode_hl2mpnormal.cpp"
-			$File	"hl2mp\clientmode_hl2mpnormal.h"
-			$File	"$SRCDIR\game\shared\hl2mp\hl2mp_gamerules.cpp"
-			$File	"$SRCDIR\game\shared\hl2mp\hl2mp_gamerules.h"
-			$File	"$SRCDIR\game\shared\hl2mp\hl2mp_player_shared.cpp"
-			$File	"$SRCDIR\game\shared\hl2mp\hl2mp_player_shared.h"
-			$File	"$SRCDIR\game\shared\hl2mp\hl2mp_weapon_parse.cpp"
-			$File	"$SRCDIR\game\shared\hl2mp\hl2mp_weapon_parse.h"
-
-			$Folder	"Weapons"
+			$Configuration
 			{
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_357.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_ar2.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_ar2.h"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_crossbow.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_crowbar.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_frag.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_hl2mpbase.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_hl2mpbase.h"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_hl2mpbase_machinegun.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_hl2mpbase_machinegun.h"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_hl2mpbasebasebludgeon.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_hl2mpbasehlmpcombatweapon.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_hl2mpbasehlmpcombatweapon.h"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_physcannon.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_physcannon.h"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_pistol.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_rpg.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_rpg.h"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_shotgun.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_slam.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_slam.h"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_smg1.cpp"
-				$File	"$SRCDIR\game\shared\hl2mp\weapon_stunstick.cpp"
-			}
-
-			$Folder	"UI"
-			{
-				$File	"hl2mp\ui\backgroundpanel.cpp"
-				$File	"hl2mp\ui\backgroundpanel.h"
-				$File	"hl2mp\hl2mp_hud_chat.cpp"
-				$File	"hl2mp\hl2mp_hud_chat.h"
-				$File	"hl2mp\hl2mp_hud_target_id.cpp"
-				$File	"hl2mp\hl2mp_hud_team.cpp"
-				$File	"hl2mp\ui\hl2mpclientscoreboard.cpp"
-				$File	"hl2mp\ui\hl2mpclientscoreboard.h"
-				$File	"hl2mp\ui\hl2mptextwindow.cpp"
-				$File	"hl2mp\ui\hl2mptextwindow.h"
-				$File	"hl2mp\hud_deathnotice.cpp"
+				$Compiler
+				{
+					$Create/UsePrecompiledHeader	"Not Using Precompiled Headers"
+					$TreatWarningsAsErrors "No"
+				}
 			}
 		}
 	}
diff --git a/mp/src/game/server/server_hl2mp.vpc b/mp/src/game/server/server_hl2mp.vpc
index 46d039db6..81cfbf384 100644
--- a/mp/src/game/server/server_hl2mp.vpc
+++ b/mp/src/game/server/server_hl2mp.vpc
@@ -6,7 +6,7 @@
 
 $Macro SRCDIR		"..\.."
 $Macro GAMENAME 	"hl2mp" [!$SOURCESDK]
-$Macro GAMENAME 	"mod_hl2mp" [$SOURCESDK]
+$Macro GAMENAME 	"momentum" [$SOURCESDK]
 
 $Include "$SRCDIR\game\server\server_base.vpc"
 $Include "$SRCDIR\game\server\nav_mesh.vpc" [$SOURCESDK]
@@ -20,7 +20,7 @@ $Configuration
 	}
 }
 
-$Project "Server (HL2MP)"
+$Project "Server (Momentum)"
 {
 	$Folder	"Source Files"
 	{
@@ -60,6 +60,97 @@ $Project "Server (HL2MP)"
 		$File	"trigger_area_capture.h"
 		$File   "$SRCDIR\game\shared\teamplay_round_timer.cpp"
 		$File   "$SRCDIR\game\shared\teamplay_round_timer.h"
+		
+		$Folder "Momentum"
+		{
+			$Folder "Util"
+			{
+				$File "momentum\tickset.h"
+
+				$File "momentum\tickset.cpp"
+				{
+					$Configuration
+					{
+						$Compiler
+						{
+							$Create/UsePrecompiledHeader	"Not Using Precompiled Headers"
+						}
+					}
+				}
+
+				$File "$SRCDIR\game\shared\momentum\util\mom_util.cpp"
+				$File "$SRCDIR\game\shared\momentum\util\mom_util.h"
+			}
+
+			$Folder "Timer"
+			{
+				$File	"momentum\Timer.h"
+				$File	"momentum\Timer.cpp"
+			}
+
+			$File   "momentum\mom_triggers.h"
+			$File	"momentum\mom_triggers.cpp"
+
+			$Folder "Weapons"
+			{
+			    $File "$SRCDIR\game\shared\momentum\weapon_momentum_gun.cpp"
+				//MOM_TODO: Add the rest of the weapon files here
+				$File "$SRCDIR\game\shared\momentum\basecsgrenade_projectile.cpp"
+				$File "$SRCDIR\game\shared\momentum\basecsgrenade_projectile.h"
+				$File "$SRCDIR\game\shared\momentum\cs_ammodef.cpp"
+				$File "$SRCDIR\game\shared\momentum\cs_ammodef.h"
+				$File "$SRCDIR\game\shared\momentum\cs_playeranimstate.cpp"
+				$File "$SRCDIR\game\shared\momentum\cs_playeranimstate.h"
+				$File "$SRCDIR\game\shared\momentum\cs_weapon_parse.cpp"
+				$File "$SRCDIR\game\shared\momentum\cs_weapon_parse.h"
+				$File "momentum\flashbang_projectile.h"
+				$File "momentum\flashbang_projectile.cpp"
+				$File "momentum\hegrenade_projectile.h"
+				$File "momentum\hegrenade_projectile.cpp"
+				$File "momentum\smokegrenade_projectile.h"
+				$File "momentum\smokegrenade_projectile.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_csbase.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_csbase.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_csbasegun.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_csbasegun.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_cs_heavy.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_cs_pistols.cpp"
+                $File "$SRCDIR\game\shared\momentum\weapon_cs_rifles.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_cs_smgs.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_basecsgrenade.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_basecsgrenade.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_flashbang.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_flashbang.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_hegrenade.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_hegrenade.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_knife.cpp"
+				$File "$SRCDIR\game\shared\momentum\weapon_knife.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_smokegrenade.h"
+				$File "$SRCDIR\game\shared\momentum\weapon_smokegrenade.cpp"
+			}
+
+			$File	"momentum\server_events.h"
+			$File	"momentum\server_events.cpp"
+			$File	"momentum\mapzones.h"
+			$File	"momentum\mapzones.cpp"
+			$File	"momentum\mapzones_edit.h"
+			$File	"momentum\mapzones_edit.cpp"
+			$File   "$SRCDIR\game\shared\momentum\mom_gamemovement.cpp"
+			$File   "$SRCDIR\game\shared\momentum\mom_gamemovement.h"
+			$File   "$SRCDIR\game\shared\momentum\mom_gamerules.cpp"
+			$File   "$SRCDIR\game\shared\momentum\mom_gamerules.h"
+			$File   "$SRCDIR\game\shared\momentum\mom_player_shared.h"
+			$File   "$SRCDIR\game\shared\momentum\mom_player_shared.cpp"
+			$File   "$SRCDIR\game\shared\momentum\mom_usermessages.cpp"
+			$File   "$SRCDIR\game\shared\momentum\mom_shareddefs.h"
+			$File   "momentum\mom_client.cpp"
+			$File   "momentum\mom_player.cpp"
+			$File   "momentum\mom_player.h"
+			$File   "momentum\te_shotgun_shot.cpp"
+			$File   "momentum\te_shotgun_shot.h"
+			$File   "$SRCDIR\game\shared\momentum\fx_cs_shared.h"
+			$File   "$SRCDIR\game\shared\momentum\fx_cs_shared.cpp"
+		}
 
 		$Folder	"HL2 DLL"
 		{
diff --git a/mp/src/thirdparty/gason b/mp/src/thirdparty/gason
new file mode 160000
index 000000000..951845c2d
--- /dev/null
+++ b/mp/src/thirdparty/gason
@@ -0,0 +1 @@
+Subproject commit 951845c2d5d95e05d5356e7f68556883a9ab0878