diff --git a/changelog.txt b/changelog.txt
index 1e29a72867..cb969ee43c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,9 @@
 New Main Menu UI
     Thanks to NicolasDe from Project-9 for GameUI2
     New background (from tutorial levels) to accomodate the shininess
+Play Replays from Leaderboards
+    Right-clicking when the leaderboards are open will allow you to right click a run and "Watch Replay"
+    More functionality in future updates!
 Contact/Feedback Panel
     Introduced a panel for in-game feedback, available in the menu.
 Overhauled Settings Panel
@@ -23,6 +26,8 @@ Bug/Other fixes
     Fixed the Changelog panel to properly scroll to top upon load
     Removed ability to save/load (use the checkpoint menu instead!)
     Fixed Biohazard90's Source Shader Editor (faulty config)
+    Fixed Version Update panel showing when you have a higher version than master
+    Fixed a bug in the blockfix system with incorporating the mom_bhop_playblocksound cvar
     
 0.4.7
 Bugfixes
diff --git a/mp/game/momentum/resource/ClientScheme.res b/mp/game/momentum/resource/ClientScheme.res
index dbc5bac219..333541fe64 100644
--- a/mp/game/momentum/resource/ClientScheme.res
+++ b/mp/game/momentum/resource/ClientScheme.res
@@ -20,6 +20,9 @@ Scheme
 		"Gray" 				"128 128 128 150"
 		"Dark Gray" 		"64 64 64 200"
 		
+        "Light Blue" "51 122 183 255"
+        "Dark Blue" "22 69 119 255"
+        
 		"Red"                "192 28 0 140"
 		"Black"                "0 0 0 196"
 		"TransparentBlack"    "0 0 0 196"
@@ -145,14 +148,14 @@ Scheme
 		ListPanel.TextColor					"White"
 		ListPanel.BgColor					"TransparentBlack"
 		ListPanel.SelectedTextColor			"Black"
-		ListPanel.SelectedBgColor			"Red"
-		ListPanel.SelectedOutOfFocusBgColor	"Red"
+		ListPanel.SelectedBgColor			"Light Blue"
+		ListPanel.SelectedOutOfFocusBgColor	"Dark Blue"
 		ListPanel.EmptyListInfoTextColor	"White"
 
 		Menu.TextColor					"White"
 		Menu.BgColor					"TransparentBlack"
 		Menu.ArmedTextColor				"White"
-		Menu.ArmedBgColor				"Red"
+		Menu.ArmedBgColor				"Light Blue"
 		Menu.TextInset					"6"
 
 		Chat.TypingText					"White"
@@ -191,10 +194,10 @@ Scheme
 		SectionedListPanel.TextColor		"White"
 		SectionedListPanel.BrightTextColor	"White"
 		SectionedListPanel.BgColor			"TransparentLightBlack"
-		SectionedListPanel.SelectedTextColor			"Black"
-		SectionedListPanel.SelectedBgColor				"Red"
-		SectionedListPanel.OutOfFocusSelectedTextColor	"Black"
-		SectionedListPanel.OutOfFocusSelectedBgColor	"255 255 255 32"
+		SectionedListPanel.SelectedTextColor			"White"
+		SectionedListPanel.SelectedBgColor				"Dark Blue"
+		SectionedListPanel.OutOfFocusSelectedTextColor	"White"
+		SectionedListPanel.OutOfFocusSelectedBgColor	"Light Blue"
 
 		Slider.NobColor				"108 108 108 255"
 		Slider.TextColor			"127 140 127 255"
diff --git a/mp/game/momentum/resource/momentum_english.txt b/mp/game/momentum/resource/momentum_english.txt
index fd6fd6afb8..18066b0c96 100644
Binary files a/mp/game/momentum/resource/momentum_english.txt and b/mp/game/momentum/resource/momentum_english.txt differ
diff --git a/mp/game/momentum/resource2/schememainmenu.res b/mp/game/momentum/resource2/schememainmenu.res
index 564b640618..f401af9411 100644
--- a/mp/game/momentum/resource2/schememainmenu.res
+++ b/mp/game/momentum/resource2/schememainmenu.res
@@ -64,7 +64,7 @@
 	"Colors"
 	{
         "White" "255 255 255 255"
-        "Light.Blue" "51 122 183 255"
+        "Light Blue" "51 122 183 255"
         "Dark Blue" "22 69 119 255"
     
 		"MainMenu.Logo.Left"							"255 255 255 255"
diff --git a/mp/src/game/client/client_momentum.vpc b/mp/src/game/client/client_momentum.vpc
index 1e61d8d712..bd57cc15f4 100644
--- a/mp/src/game/client/client_momentum.vpc
+++ b/mp/src/game/client/client_momentum.vpc
@@ -108,7 +108,9 @@ $Project "Client (Momentum)"
                 
                 $File   "momentum\ui\ClientTimesDisplay.h"
                 $File   "momentum\ui\ClientTimesDisplay.cpp"
-                
+                $File 	"momentum\ui\ReplayContextMenu.h"
+                $File 	"momentum\ui\ReplayContextMenu.cpp"
+
                 $File   "momentum\ui\IVersionWarnPanel.h"
                 $File   "momentum\ui\VersionWarnPanel.cpp"
                 $File   "momentum\ui\VersionWarnPanel.h"
diff --git a/mp/src/game/client/momentum/ui/ClientTimesDisplay.cpp b/mp/src/game/client/momentum/ui/ClientTimesDisplay.cpp
index c3e1051967..8ff4113e49 100644
--- a/mp/src/game/client/momentum/ui/ClientTimesDisplay.cpp
+++ b/mp/src/game/client/momentum/ui/ClientTimesDisplay.cpp
@@ -21,6 +21,7 @@
 #include <vgui/ILocalize.h>
 #include <vgui/ISurface.h>
 #include <vgui/IVGui.h>
+#include <vgui/IInput.h>
 #include <vstdlib/IKeyValuesSystem.h>
 
 #include <KeyValues.h>
@@ -69,7 +70,7 @@ CClientTimesDisplay::CClientTimesDisplay(IViewPort *pViewPort) : EditablePanel(n
     m_pPlayerList = new SectionedListPanel(this, "PlayerList");
     m_pPlayerList->SetVerticalScrollbar(false);
 
-    LoadControlSettings("Resource/UI/timesdisplay.res");
+    LoadControlSettings("resource/ui/timesdisplay.res");
 
     m_pHeader = FindControl<Panel>("Header", true);
     m_lMapSummary = FindControl<Label>("MapSummary", true);
@@ -77,8 +78,8 @@ CClientTimesDisplay::CClientTimesDisplay(IViewPort *pViewPort) : EditablePanel(n
     m_pPlayerStats = FindControl<Panel>("PlayerStats", true);
     m_pPlayerAvatar = FindControl<ImagePanel>("PlayerAvatar", true);
     m_lPlayerName = FindControl<Label>("PlayerName", true);
-	m_lPlayerMapRank = FindControl<Label>("PlayerMapRank", true);
-	m_lPlayerGlobalRank = FindControl<Label>("PlayerGlobalRank", true);
+    m_lPlayerMapRank = FindControl<Label>("PlayerMapRank", true);
+    m_lPlayerGlobalRank = FindControl<Label>("PlayerGlobalRank", true);
     m_pLeaderboards = FindControl<Panel>("Leaderboards", true);
     m_pOnlineLeaderboards = FindControl<SectionedListPanel>("OnlineLeaderboards", true);
     m_pLocalLeaderboards = FindControl<SectionedListPanel>("LocalLeaderboards", true);
@@ -108,10 +109,16 @@ CClientTimesDisplay::CClientTimesDisplay(IViewPort *pViewPort) : EditablePanel(n
     m_pLocalLeaderboards->SetVerticalScrollbar(false);
     m_pFriendsLeaderboards->SetVerticalScrollbar(false);
 
+    m_pLeaderboards->SetMouseInputEnabled(true);
+
     m_pLocalLeaderboards->SetMouseInputEnabled(true);
     m_pOnlineLeaderboards->SetMouseInputEnabled(true);
     m_pFriendsLeaderboards->SetMouseInputEnabled(true);
 
+    m_pLocalLeaderboards->SetKeyBoardInputEnabled(true);
+    m_pLocalLeaderboards->SetClickable(true);
+    m_pLocalLeaderboards->AddActionSignalTarget(this);
+
     m_pMomentumLogo->GetImage()->SetSize(scheme()->GetProportionalScaledValue(256), scheme()->GetProportionalScaledValue(64));
 
     m_iDesiredHeight = GetTall();
@@ -122,6 +129,8 @@ CClientTimesDisplay::CClientTimesDisplay(IViewPort *pViewPort) : EditablePanel(n
     ListenForGameEvent("run_upload");
     ListenForGameEvent("game_newmap");
 
+    m_pLeaderboardReplayCMenu = new CReplayContextMenu(this);
+
     m_pImageList = nullptr;
     m_mapAvatarsToImageList.SetLessFunc(DefLessFunc(CSteamID));
     m_mapAvatarsToImageList.RemoveAll();
@@ -137,6 +146,12 @@ CClientTimesDisplay::~CClientTimesDisplay()
         delete m_pImageList;
         m_pImageList = nullptr;
     }
+
+    if (m_pLeaderboardReplayCMenu)
+    {
+        delete m_pLeaderboardReplayCMenu;
+        m_pLeaderboardReplayCMenu = nullptr;
+    }
     // MOM_TODO: Ensure a good destructor
 }
 
@@ -178,7 +193,7 @@ void CClientTimesDisplay::OnThink()
 //-----------------------------------------------------------------------------
 void CClientTimesDisplay::OnPollHideCode(int code)
 {
-    m_nCloseKey = (ButtonCode_t) code;
+    m_nCloseKey = (ButtonCode_t)code;
 }
 
 //-----------------------------------------------------------------------------
@@ -260,7 +275,7 @@ void CClientTimesDisplay::InitScoreboardSections()
 void CClientTimesDisplay::ApplySchemeSettings(IScheme *pScheme)
 {
     BaseClass::ApplySchemeSettings(pScheme);
-    
+
     if (m_pImageList)
         delete m_pImageList;
     m_pImageList = new ImageList(false);
@@ -321,6 +336,14 @@ void CClientTimesDisplay::ShowPanel(bool bShow)
         InvalidateLayout(true, true);
     }
 
+    if (m_pLeaderboardReplayCMenu)
+    {
+        //Close the menu
+        m_pLeaderboardReplayCMenu->OnKillFocus();
+        m_pLeaderboardReplayCMenu->DeletePanel();
+    }
+    m_pLeaderboardReplayCMenu = nullptr;
+
     if (!bShow)
     {
         m_nCloseKey = BUTTON_CODE_INVALID;
@@ -337,7 +360,7 @@ void CClientTimesDisplay::ShowPanel(bool bShow)
         MoveToFront();
     }
     else
-    { 
+    {
         SetVisible(false);
         SetMouseInputEnabled(false);//Turn mouse off
         SetKeyBoardInputEnabled(false);
@@ -525,13 +548,14 @@ void CClientTimesDisplay::LoadLocalTimes(KeyValues *kv)
 
         //Load from .tim file
         KeyValues *pLoaded = new KeyValues("local");
-        char fileName[MAX_PATH];
-
-        Q_snprintf(fileName, MAX_PATH, "maps/%s.tim", g_pGameRules->MapName() ? g_pGameRules->MapName() : "FIXME");
+        char fileName[MAX_PATH], filePath[MAX_PATH];
+        const char *mapName = g_pGameRules->MapName();
+        Q_snprintf(fileName, MAX_PATH, "%s%s", mapName ? mapName : "FIXME", EXT_TIME_FILE);
+        V_ComposeFileName(MAP_FOLDER, fileName, filePath, MAX_PATH);
 
-        if (pLoaded->LoadFromFile(filesystem, fileName, "MOD"))
+        DevLog("Loading from file %s...\n", filePath);
+        if (pLoaded->LoadFromFile(filesystem, filePath, "MOD"))
         {
-            DevLog("Loading from file %s...\n", fileName);
             for (KeyValues* kvLocalTime = pLoaded->GetFirstSubKey(); kvLocalTime; kvLocalTime = kvLocalTime->GetNextKey())
             {
                 Time t = Time(kvLocalTime);
@@ -554,7 +578,6 @@ void CClientTimesDisplay::ConvertLocalTimes(KeyValues *kvInto)
     FOR_EACH_VEC(m_vLocalTimes, i)
     {
         Time t = m_vLocalTimes[i];
-        //MOM_TODO: consider adding a "100 tick" column?
 
         KeyValues *kvLocalTimeFormatted = new KeyValues("localtime");
         kvLocalTimeFormatted->SetFloat("time_f", t.time_sec);//Used for static compare
@@ -646,7 +669,7 @@ void CClientTimesDisplay::UpdatePlayerAvatar(int playerIndex, KeyValues *kv)
 
                 kv->SetInt("avatar", iImageIndex);
 
-                CAvatarImage *pAvIm = (CAvatarImage *) m_pImageList->GetImage(iImageIndex);
+                CAvatarImage *pAvIm = (CAvatarImage *)m_pImageList->GetImage(iImageIndex);
                 pAvIm->UpdateFriendStatus();
                 // Set friend draw to false, so the offset is not set
                 pAvIm->SetDrawFriend(false);
@@ -737,8 +760,7 @@ void CClientTimesDisplay::FillScoreBoard(bool pFullUpdate)
         KeyValues *kvLocalTimes = kvLeaderboards->FindKey("local");
         if (kvLocalTimes && !kvLocalTimes->IsEmpty())
         {
-            for (KeyValues *kvLocalTime = kvLocalTimes->GetFirstSubKey(); kvLocalTime;
-                kvLocalTime = kvLocalTime->GetNextKey())
+            FOR_EACH_SUBKEY(kvLocalTimes, kvLocalTime)
             {
                 int itemID = FindItemIDForLocalTime(kvLocalTime);
                 if (itemID == -1)
@@ -808,4 +830,53 @@ void CClientTimesDisplay::MoveToCenterOfScreen()
     int wx, wy, ww, wt;
     surface()->GetWorkspaceBounds(wx, wy, ww, wt);
     SetPos((ww - GetWide()) / 2, (wt - GetTall()) / 2);
+}
+
+CReplayContextMenu *CClientTimesDisplay::GetLeaderboardReplayContextMenu(Panel *pParent)
+{
+    // create a drop down for this object's states
+    // This will stop being created after the second time you open the leaderboards?
+    if (m_pLeaderboardReplayCMenu)
+        delete m_pLeaderboardReplayCMenu;
+    m_pLeaderboardReplayCMenu = new CReplayContextMenu(this);
+    m_pLeaderboardReplayCMenu->SetAutoDelete(false);
+   
+    if (!pParent)
+    {
+        m_pLeaderboardReplayCMenu->SetParent(this);
+    }
+    else
+    {
+        m_pLeaderboardReplayCMenu->AddActionSignalTarget(pParent);
+        m_pLeaderboardReplayCMenu->SetParent(pParent);
+    }
+
+    m_pLeaderboardReplayCMenu->SetVisible(false);
+    return m_pLeaderboardReplayCMenu;
+}
+
+void CClientTimesDisplay::OnContextWatchReplay(const char *runName)
+{
+    if (runName)
+    {
+        char command[MAX_PATH];
+        Q_snprintf(command, MAX_PATH, "mom_replay_play %s", runName);
+        engine->ServerCmd(command);
+        ShowPanel(false);
+    }
+}
+
+void CClientTimesDisplay::OnItemContextMenu(KeyValues *pData)
+{
+    int itemID = pData->GetInt("itemID", -1);
+    Panel *pPanel = static_cast<Panel*>(pData->GetPtr("SubPanel", nullptr));
+    
+    KeyValues * selectedRun = m_pLocalLeaderboards->GetItemData(itemID);
+    char recordingName[MAX_PATH];
+    Q_snprintf(recordingName, MAX_PATH, "%i-%f", selectedRun->GetInt("date_t"), selectedRun->GetFloat("time_f"));
+
+    if (pPanel->GetParent())
+    {
+        GetLeaderboardReplayContextMenu(pPanel->GetParent())->ShowMenu(this, recordingName);
+    }
 }
\ No newline at end of file
diff --git a/mp/src/game/client/momentum/ui/ClientTimesDisplay.h b/mp/src/game/client/momentum/ui/ClientTimesDisplay.h
index a13eb8faea..4b876770b8 100644
--- a/mp/src/game/client/momentum/ui/ClientTimesDisplay.h
+++ b/mp/src/game/client/momentum/ui/ClientTimesDisplay.h
@@ -20,6 +20,8 @@
 #include <vgui_controls/EditablePanel.h>
 #include <vgui_controls/SectionedListPanel.h>
 
+#include "ReplayContextMenu.h"
+
 #define TYPE_NOTEAM 0 // NOTEAM must be zero :)
 #define TYPE_TEAM 1   // a section for a single team
 #define TYPE_PLAYERS 2
@@ -28,6 +30,7 @@
 
 #define SCALE(num) scheme()->GetProportionalScaledValueEx(GetScheme(), (num))
 
+
 //-----------------------------------------------------------------------------
 // Purpose: Game ScoreBoard
 //-----------------------------------------------------------------------------
@@ -81,18 +84,13 @@ class CClientTimesDisplay : public vgui::EditablePanel, public IViewPortPanel, p
 
     virtual void UpdatePlayerAvatar(int playerIndex, KeyValues *kv);
 
-    void OnMousePressed(vgui::MouseCode code) override
-    {
-        //Log("MOUSE RELEASED: %i\n", code);
-        
-        if (code == MOUSE_RIGHT)
-        {
-            //MOM_TODO: Show a menu with like "Watch Replay"
-        }
-    }
+    CReplayContextMenu *GetLeaderboardReplayContextMenu(vgui::Panel *pParent);
 
   protected:
     MESSAGE_FUNC_INT(OnPollHideCode, "PollHideCode", code);
+    MESSAGE_FUNC_PARAMS(OnItemContextMenu, "ItemContextMenu", data);//Catching from SectionedListPanel
+    MESSAGE_FUNC_CHARPTR(OnContextWatchReplay, "ContextWatchReplay", runName);
+
 
     // functions to override
     virtual bool GetPlayerTimes(KeyValues *outPlayerInfo);
@@ -149,7 +147,6 @@ class CClientTimesDisplay : public vgui::EditablePanel, public IViewPortPanel, p
     CPanelAnimationVarAliasType(int, m_iScoreWidth, "score_width", "35", "proportional_int");
     CPanelAnimationVarAliasType(int, m_iDeathWidth, "death_width", "35", "proportional_int");
     CPanelAnimationVarAliasType(int, m_iPingWidth, "ping_width", "23", "proportional_int");
-
   private:
     int m_iPlayerIndexSymbol;
     int m_iDesiredHeight;
@@ -183,6 +180,7 @@ class CClientTimesDisplay : public vgui::EditablePanel, public IViewPortPanel, p
     void FillScoreBoard(bool pFullUpdate);
     void LoadLocalTimes(KeyValues *kv);
     void ConvertLocalTimes(KeyValues *);
-};
 
+    CReplayContextMenu *m_pLeaderboardReplayCMenu;
+};
 #endif // CLIENTSCOREBOARDDIALOG_H
\ No newline at end of file
diff --git a/mp/src/game/client/momentum/ui/ReplayContextMenu.cpp b/mp/src/game/client/momentum/ui/ReplayContextMenu.cpp
new file mode 100644
index 0000000000..2325a855dc
--- /dev/null
+++ b/mp/src/game/client/momentum/ui/ReplayContextMenu.cpp
@@ -0,0 +1,49 @@
+#include "cbase.h"
+#include <vgui/IScheme.h>
+#include <vgui/ILocalize.h>
+#include <vgui/ISurface.h>
+#include <vgui/IVGui.h>
+#include <vgui/IInput.h>
+#include "inputsystem/iinputsystem.h"
+#include "ReplayContextMenu.h"
+
+using namespace vgui;
+
+//-----------------------------------------------------------------------------
+// Purpose: Constructor
+//-----------------------------------------------------------------------------
+CReplayContextMenu::CReplayContextMenu(Panel *parent) : Menu(parent, "ReplayContextMenu")
+{
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Destructor
+//-----------------------------------------------------------------------------
+CReplayContextMenu::~CReplayContextMenu()
+{
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Activates the menu
+//-----------------------------------------------------------------------------
+void CReplayContextMenu::ShowMenu(Panel *target, const char *runName)
+{
+    if (runName)
+    {
+        AddMenuItem("StartMap", "#MOM_Leaderboards_WatchReplay", new KeyValues("ContextWatchReplay", "runName", runName), target);
+    }
+
+    int x, y, gx, gy;
+    input()->GetCursorPos(x, y);
+    ipanel()->GetPos(surface()->GetEmbeddedPanel(), gx, gy);
+    SetPos(x - gx - 5, y - gy - 5);
+    SetVisible(true);
+    SetMouseInputEnabled(true);
+}
+
+void CReplayContextMenu::OnCursorExitedMenuItem(int vpanel)
+{ 
+    SetVisible(false);
+    SetMouseInputEnabled(false);
+    BaseClass::OnCursorExitedMenuItem(vpanel);
+}
diff --git a/mp/src/game/client/momentum/ui/ReplayContextMenu.h b/mp/src/game/client/momentum/ui/ReplayContextMenu.h
new file mode 100644
index 0000000000..a3a6db4068
--- /dev/null
+++ b/mp/src/game/client/momentum/ui/ReplayContextMenu.h
@@ -0,0 +1,28 @@
+#ifndef REPLAYCONTEXTMENU_H
+#define REPLAYCONTEXTMENU_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+#include "cbase.h"
+#include <vgui_controls/Menu.h>
+
+//-----------------------------------------------------------------------------
+// Purpose: Basic right-click context menu for servers
+//-----------------------------------------------------------------------------
+class CReplayContextMenu : public vgui::Menu
+{
+public:
+    DECLARE_CLASS_SIMPLE(CReplayContextMenu, vgui::Menu);
+    CReplayContextMenu(vgui::Panel *parent);
+    ~CReplayContextMenu();
+
+    // call this to Activate the menu
+    void ShowMenu( vgui::Panel *target, const char *runName);
+    void OnCursorExitedMenuItem(int vpanel) override;
+    // This one works weird, so using OnCurosExitedMenuItem until we figure how it works
+    //void OnCursorExited() override;
+};
+
+
+#endif // REPLAYCONTEXTMENU_H
\ No newline at end of file
diff --git a/mp/src/game/server/doors.cpp b/mp/src/game/server/doors.cpp
index 09d9e61a82..60d3a6ce64 100644
--- a/mp/src/game/server/doors.cpp
+++ b/mp/src/game/server/doors.cpp
@@ -12,6 +12,7 @@
 #include "ndebugoverlay.h"
 #include "engine/IEngineSound.h"
 #include "physics_npc_solver.h"
+#include "buttons.h"
 
 #ifdef HL1_DLL
 #include "filters.h"
@@ -121,7 +122,14 @@ END_SEND_TABLE()
 //-----------------------------------------------------------------------------
 void PlayLockSounds(CBaseEntity *pEdict, locksound_t *pls, int flocked, int fbutton)
 {
-    if (pEdict->HasSpawnFlags(SF_DOOR_SILENT) || !ConVarRef("mom_bhop_playblocksound").GetBool())
+    CBaseDoor *pDoor = dynamic_cast<CBaseDoor*>(pEdict);
+    // Dynamic_cast is more expensive than a normal cast, so we should only do it if we need it.
+    // As pDoor will be nullptr if it's not a Door, then it has to be a Button, and that is the only moment when
+    // we need to dynamic_cast pEdict into button. This way we save a dynamic_cast most of the times (Most blocks are doors)
+    CBaseButton *pButton = pDoor ? nullptr : dynamic_cast<CBaseButton*>(pEdict);
+    bool isMomentumBlock = pDoor ? pDoor->m_bIsBhopBlock : (pButton ? pButton->m_bIsBhopBlock : false);
+    bool shouldPlayBhopSound = ConVarRef("mom_bhop_playblocksound").GetBool();
+    if (pEdict->HasSpawnFlags(SF_DOOR_SILENT) || (isMomentumBlock && !shouldPlayBhopSound))
 	{
 		return;
 	}
diff --git a/mp/src/game/server/momentum/Timer.cpp b/mp/src/game/server/momentum/Timer.cpp
index 2204127c99..08327ee867 100644
--- a/mp/src/game/server/momentum/Timer.cpp
+++ b/mp/src/game/server/momentum/Timer.cpp
@@ -11,6 +11,7 @@ void CTimer::Start(int start)
     if (zoneEdit.GetBool()) return;
     m_iStartTick = start;
     m_iEndTick = 0;
+    m_iLastRunDate = 0;
     SetRunning(true);
 
     //Dispatch a start timer message for the local player
@@ -258,9 +259,10 @@ void CTimer::Stop(bool endTrigger /* = false */)
         Time t = Time();
         t.time_sec = GetLastRunTime();
 
-        t.tickrate = gpGlobals->interval_per_tick; // 
+        t.tickrate = gpGlobals->interval_per_tick; // Set the tickrate
         t.flags = pPlayer->m_RunData.m_iRunFlags; // Set the run flags of this run
         time(&t.date); // Set the date of this run
+        m_iLastRunDate = t.date;// Use this date for the replay file
         t.RunStats = static_cast<CMomRunStats>(pPlayer->m_RunStats); //copy all the run stats
 
         AddNewTime(&t);
diff --git a/mp/src/game/server/momentum/Timer.h b/mp/src/game/server/momentum/Timer.h
index 0f6bf90567..c13169e81a 100644
--- a/mp/src/game/server/momentum/Timer.h
+++ b/mp/src/game/server/momentum/Timer.h
@@ -116,6 +116,11 @@ class CTimer
         // offset from end is 1 tick - fraction offset, since we started trace outside of the end zone.
         return originalTime + m_flTickOffsetFix[1] - (gpGlobals->interval_per_tick - m_flTickOffsetFix[0]);
     }
+    // Gets the date achieved for the last run.
+    time_t GetLastRunDate() const
+    {
+        return m_iLastRunDate;
+    }
 
     // Gets the current time for this timer
     float GetCurrentTime() const { return float(gpGlobals->tickcount - m_iStartTick) * gpGlobals->interval_per_tick; }
@@ -212,6 +217,7 @@ class CTimer
     int m_iZoneCount;
     int m_iStartTick, m_iEndTick;
     int m_iLastZone;
+    time_t m_iLastRunDate;
     bool m_bIsRunning;
     bool m_bWereCheatsActivated;
     bool m_bMapIsLinear;
diff --git a/mp/src/game/server/momentum/mom_blockfix.cpp b/mp/src/game/server/momentum/mom_blockfix.cpp
index 5297283567..6bec4cc011 100644
--- a/mp/src/game/server/momentum/mom_blockfix.cpp
+++ b/mp/src/game/server/momentum/mom_blockfix.cpp
@@ -58,8 +58,8 @@ void CMOMBhopBlockFixSystem::AlterBhopBlock(bhop_block_t block)
         variant_t emptyvarient;
         pDoorEnt->AcceptInput("Lock", nullptr, nullptr, emptyvarient, 0); // Lock the door bhop block
 
-        pDoorEnt->m_ls.sLockedSound =
-            pDoorEnt->m_NoiseMoving; // Plays the sound like normal (makes the player aware they jumped it)
+        // Plays the sound like normal (makes the player aware they jumped it)
+        pDoorEnt->m_ls.sLockedSound = pDoorEnt->m_NoiseMoving; 
 
         // Let the entity know that it's a bhop block, so mom_bhop_playblocksound is able to control if we should make noises
         pDoorEnt->m_bIsBhopBlock = true;
diff --git a/mp/src/game/server/momentum/mom_replay_base.h b/mp/src/game/server/momentum/mom_replay_base.h
index f30839cf23..91818010bc 100644
--- a/mp/src/game/server/momentum/mom_replay_base.h
+++ b/mp/src/game/server/momentum/mom_replay_base.h
@@ -26,6 +26,7 @@ class CMomReplayBase :
     virtual float GetTickInterval() { return m_rhHeader.m_fTickInterval; }
     virtual float GetRunTime() { return m_rhHeader.m_fRunTime; }
     virtual int GetRunFlags() { return m_rhHeader.m_iRunFlags; }
+    virtual time_t GetRunDate() { return m_rhHeader.m_iRunDate; }
     virtual CMomentumReplayGhostEntity *GetRunEntity() { return m_pEntity; }
 
 public:
@@ -35,6 +36,7 @@ class CMomReplayBase :
     virtual void SetTickInterval(float interval) { m_rhHeader.m_fTickInterval = interval; }
     virtual void SetRunTime(float runTime) { m_rhHeader.m_fRunTime = runTime; }
     virtual void SetRunFlags(int runFlags) { m_rhHeader.m_iRunFlags = runFlags; }
+    virtual void SetRunDate(time_t date) { m_rhHeader.m_iRunDate = date; }
     virtual void SetRunEntity(CMomentumReplayGhostEntity *pEnt) { m_pEntity = pEnt; }
 
 public:
diff --git a/mp/src/game/server/momentum/mom_replay_data.h b/mp/src/game/server/momentum/mom_replay_data.h
index a2c285af42..635c943a68 100644
--- a/mp/src/game/server/momentum/mom_replay_data.h
+++ b/mp/src/game/server/momentum/mom_replay_data.h
@@ -77,6 +77,7 @@ class CReplayHeader :
         m_fTickInterval = reader->ReadFloat();
         m_fRunTime = reader->ReadFloat();
         m_iRunFlags = reader->ReadInt32();
+        m_iRunDate = reader->ReadInt64();
     }
 
 public:
@@ -88,6 +89,7 @@ class CReplayHeader :
         writer->WriteFloat(m_fTickInterval);
         writer->WriteFloat(m_fRunTime);
         writer->WriteInt32(m_iRunFlags);
+        writer->WriteInt64(m_iRunDate);
     }
 
 public:
@@ -97,4 +99,5 @@ class CReplayHeader :
     float m_fTickInterval; // The tickrate of the run.
     float m_fRunTime; // The total runtime of the run in seconds.
     int m_iRunFlags; // The flags the player ran with.
+    time_t m_iRunDate; //The date this run was achieved.
 };
\ No newline at end of file
diff --git a/mp/src/game/server/momentum/mom_replay_manager.cpp b/mp/src/game/server/momentum/mom_replay_manager.cpp
index 17d1fa9988..af212baedb 100644
--- a/mp/src/game/server/momentum/mom_replay_manager.cpp
+++ b/mp/src/game/server/momentum/mom_replay_manager.cpp
@@ -74,7 +74,7 @@ void CMomReplayManager::StopRecording()
 CMomReplayBase* CMomReplayManager::LoadReplay(const char* path, const char* pathID)
 {
     if (PlayingBack())
-        return m_pPlaybackReplay;
+        StopPlayback();
 
     if (m_pPlaybackReplay)
         UnloadPlayback();
diff --git a/mp/src/game/server/momentum/mom_replay_system.cpp b/mp/src/game/server/momentum/mom_replay_system.cpp
index 6f5449e22d..ae91233eaf 100644
--- a/mp/src/game/server/momentum/mom_replay_system.cpp
+++ b/mp/src/game/server/momentum/mom_replay_system.cpp
@@ -37,18 +37,21 @@ void CMomentumReplaySystem::StopRecording(CBasePlayer *pPlayer, bool throwaway,
         return;
     }
 
-    char newRecordingName[MAX_PATH], newRecordingPath[MAX_PATH], runTime[BUFSIZETIME];
+    char newRecordingName[MAX_PATH], newRecordingPath[MAX_PATH], runTime[MAX_PATH], runDate[MAX_PATH];
 
     m_bShouldStopRec = false;
-    CMomentumPlayer *pMOMPlayer = ToCMOMPlayer(pPlayer);
-    mom_UTIL->FormatTime(g_Timer->GetLastRunTime(), runTime, 3, true);
-    //MOM_TODO: BUG: The player name could have characters in it that cannot be saved as a file, causing a hang!
-    Q_snprintf(newRecordingName, MAX_PATH, "%s_%s_%s.momrec",
-                (pMOMPlayer ? pMOMPlayer->GetPlayerName() : "Unnamed"), gpGlobals->mapname.ToCStr(), runTime);
-    V_ComposeFileName(RECORDING_PATH, newRecordingName, newRecordingPath,
-                        MAX_PATH); // V_ComposeFileName calls all relevant filename functions for us! THANKS GABEN
+    
+    //Don't ask why, but these need to be formatted in their own strings.
+    time_t lastDate = g_Timer->GetLastRunDate();
+    Q_snprintf(runDate, MAX_PATH, "%i", lastDate);
+    float lastTime = g_Timer->GetLastRunTime();
+    Q_snprintf(runTime, MAX_PATH, "%f", lastTime);
+    //It's weird.
+
+    Q_snprintf(newRecordingName, MAX_PATH, "%s-%s%s", runDate, runTime, EXT_RECORDING_FILE);
 
-    V_FixSlashes(RECORDING_PATH);
+    // V_ComposeFileName calls all relevant filename functions for us! THANKS GABEN
+    V_ComposeFileName(RECORDING_PATH, newRecordingName, newRecordingPath, MAX_PATH); 
 
     // We have to create the directory here just in case it doesn't exist yet
     filesystem->CreateDirHierarchy(RECORDING_PATH, "MOD");
@@ -123,6 +126,7 @@ void CMomentumReplaySystem::SetReplayInfo()
     replay->SetTickInterval(gpGlobals->interval_per_tick);
     replay->SetRunTime(g_Timer->GetLastRunTime());
     replay->SetRunFlags(m_player->m_RunData.m_iRunFlags);
+    replay->SetRunDate(g_Timer->GetLastRunDate());
 }
 
 void CMomentumReplaySystem::SetRunStats()
diff --git a/mp/src/game/shared/momentum/mom_shareddefs.h b/mp/src/game/shared/momentum/mom_shareddefs.h
index be8e570b40..df929f7a9d 100644
--- a/mp/src/game/shared/momentum/mom_shareddefs.h
+++ b/mp/src/game/shared/momentum/mom_shareddefs.h
@@ -66,5 +66,6 @@ typedef enum MOMGM
 #define RECORDING_PATH "recordings"
 #define EXT_TIME_FILE ".tim" //MOM_TODO: Find and replace all instances, no hardcode.
 #define EXT_ZONE_FILE ".zon" //MOM_TODO: Find and replace all instances, no hardcode.
+#define EXT_RECORDING_FILE ".momrec"
 
 #endif // MOM_SHAREDDEFS_H
\ No newline at end of file
diff --git a/mp/src/game/shared/momentum/util/mom_util.cpp b/mp/src/game/shared/momentum/util/mom_util.cpp
index f48b9e01d5..59ad5fb39e 100644
--- a/mp/src/game/shared/momentum/util/mom_util.cpp
+++ b/mp/src/game/shared/momentum/util/mom_util.cpp
@@ -135,17 +135,24 @@ void MomentumUtil::DownloadMap(const char *szMapname)
 void MomentumUtil::CreateAndSendHTTPReq(const char *szURL, CCallResult<MomentumUtil, HTTPRequestCompleted_t> *callback,
     CCallResult<MomentumUtil, HTTPRequestCompleted_t>::func_t func)
 {
-    HTTPRequestHandle handle = steamapicontext->SteamHTTP()->CreateHTTPRequest(k_EHTTPMethodGET, szURL);
-    SteamAPICall_t apiHandle;
-
-    if (steamapicontext->SteamHTTP()->SendHTTPRequest(handle, &apiHandle))
+    if (steamapicontext && steamapicontext->SteamHTTP())
     {
-        callback->Set(apiHandle, this, func);
+        HTTPRequestHandle handle = steamapicontext->SteamHTTP()->CreateHTTPRequest(k_EHTTPMethodGET, szURL);
+        SteamAPICall_t apiHandle;
+
+        if (steamapicontext->SteamHTTP()->SendHTTPRequest(handle, &apiHandle))
+        {
+            callback->Set(apiHandle, this, func);
+        }
+        else
+        {
+            Warning("Failed to send HTTP Request to post scores online!\n");
+            steamapicontext->SteamHTTP()->ReleaseHTTPRequest(handle); // GC
+        }
     }
     else
     {
-        Warning("Failed to send HTTP Request to post scores online!\n");
-        steamapicontext->SteamHTTP()->ReleaseHTTPRequest(handle); // GC
+        Warning("Could not find Steam Api Context active\n");
     }
 }
 
@@ -243,15 +250,22 @@ void MomentumUtil::VersionCallback(HTTPRequestCompleted_t *pCallback, bool bIOFa
 
     char versionValue[15];
     Q_snprintf(versionValue, 15, "%s.%s.%s", repoVersion.Element(0), repoVersion.Element(1), repoVersion.Element(2));
+
     for (int i = 0; i < 3; i++)
     {
-        if (Q_atoi(repoVersion.Element(i)) > Q_atoi(storedVersion.Element(i)))
+        int repo = Q_atoi(repoVersion.Element(i)), local = Q_atoi(storedVersion.Element(i));
+        if (repo > local)
         {
             versionwarnpanel->SetVersion(versionValue);
             GetRemoteChangelog();
             versionwarnpanel->Activate();
             break;
         }
+        if (repo < local)
+        {
+            //The local version is higher than the repo version, do not show this panel
+            break;
+        }
     }
 
     CleanupRequest(pCallback, pData);