diff --git a/CookieMonster.js b/CookieMonster.js
index f34e6e9..945a469 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -16,6 +16,8 @@ RunCookieMonsterHeader = function() {
 
     CM.Disp = {};
 
+    CM.Main = {};
+
     CM.Sim = {};
 }
 
@@ -552,7 +554,9 @@ CM.Cache.MissingCookies = Game.Upgrades;
 CM.Cache.UpgradesOwned = -1;
 CM.Cache.MissingUpgradesString = null;
 CM.Cache.MissingCookiesString = null;
-
+CM.Cache.seasonPopShimmer;
+CM.Cache.goldenShimmersByID = {};
+CM.Cache.spawnedGoldenShimmer = 0;
 /**********
  * Config *
  **********/
@@ -3337,20 +3341,11 @@ CM.Disp.colorPink = 'Pink';
 CM.Disp.colorBrown = 'Brown';
 CM.Disp.colors = [CM.Disp.colorBlue, CM.Disp.colorGreen, CM.Disp.colorYellow, CM.Disp.colorOrange, CM.Disp.colorRed, CM.Disp.colorPurple, CM.Disp.colorGray, CM.Disp.colorPink, CM.Disp.colorBrown];
 CM.Disp.buffColors = {'Frenzy': CM.Disp.colorYellow, 'Dragon Harvest': CM.Disp.colorBrown, 'Elder frenzy': CM.Disp.colorGreen, 'Clot': CM.Disp.colorRed, 'Click frenzy': CM.Disp.colorBlue, 'Dragonflight': CM.Disp.colorPink};
-CM.Main.lastGoldenCookieState = 0;
-CM.Main.lastSpawnedGoldenCookieState = 0;
-CM.Main.currSpawnedGoldenCookieState
-CM.Main.lastTickerFortuneState = 0;
-CM.Main.lastSeasonPopupState = 0;
-CM.Main.lastGardenNextStep = 0;
-CM.Main.lastMagicBarFull = 0;
-CM.Main.lastWrinklerCount = 0;
-CM.Cache.goldenShimmersByID = {};
-CM.Cache.spawnedGoldenShimmer = 0;
 CM.Disp.GCTimers = {};
-CM.Cache.seasonPopShimmer;
 CM.Disp.lastAscendState = -1;
 
+
+
 CM.Disp.cookieTimes = [10, 15, 30, 60, 300, 600, 900, 1800];
 CM.Disp.clickTimes = [1, 5, 10, 15, 30];
 
@@ -3786,6 +3781,15 @@ CM.Main.CheckWrinklerCount = function() {
 CM.HasReplaceNativeGrimoireLaunch = false;
 CM.HasReplaceNativeGrimoireDraw = false;
 
+CM.Main.lastGoldenCookieState = 0;
+CM.Main.lastSpawnedGoldenCookieState = 0;
+CM.Main.currSpawnedGoldenCookieState
+CM.Main.lastTickerFortuneState = 0;
+CM.Main.lastSeasonPopupState = 0;
+CM.Main.lastGardenNextStep = 0;
+CM.Main.lastMagicBarFull = 0;
+CM.Main.lastWrinklerCount = 0;
+
 CM.ConfigDefault = {
 	BotBar: 1, 
 	TimerBar: 1, 
diff --git a/src/Cache.js b/src/Cache.js
index 3fdd91d..b3a08ed 100644
--- a/src/Cache.js
+++ b/src/Cache.js
@@ -527,4 +527,6 @@ CM.Cache.MissingCookies = Game.Upgrades;
 CM.Cache.UpgradesOwned = -1;
 CM.Cache.MissingUpgradesString = null;
 CM.Cache.MissingCookiesString = null;
-
+CM.Cache.seasonPopShimmer;
+CM.Cache.goldenShimmersByID = {};
+CM.Cache.spawnedGoldenShimmer = 0;
diff --git a/src/Disp.js b/src/Disp.js
index c1557f0..a1086fa 100644
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -2459,20 +2459,11 @@ CM.Disp.colorPink = 'Pink';
 CM.Disp.colorBrown = 'Brown';
 CM.Disp.colors = [CM.Disp.colorBlue, CM.Disp.colorGreen, CM.Disp.colorYellow, CM.Disp.colorOrange, CM.Disp.colorRed, CM.Disp.colorPurple, CM.Disp.colorGray, CM.Disp.colorPink, CM.Disp.colorBrown];
 CM.Disp.buffColors = {'Frenzy': CM.Disp.colorYellow, 'Dragon Harvest': CM.Disp.colorBrown, 'Elder frenzy': CM.Disp.colorGreen, 'Clot': CM.Disp.colorRed, 'Click frenzy': CM.Disp.colorBlue, 'Dragonflight': CM.Disp.colorPink};
-CM.Main.lastGoldenCookieState = 0;
-CM.Main.lastSpawnedGoldenCookieState = 0;
-CM.Main.currSpawnedGoldenCookieState
-CM.Main.lastTickerFortuneState = 0;
-CM.Main.lastSeasonPopupState = 0;
-CM.Main.lastGardenNextStep = 0;
-CM.Main.lastMagicBarFull = 0;
-CM.Main.lastWrinklerCount = 0;
-CM.Cache.goldenShimmersByID = {};
-CM.Cache.spawnedGoldenShimmer = 0;
 CM.Disp.GCTimers = {};
-CM.Cache.seasonPopShimmer;
 CM.Disp.lastAscendState = -1;
 
+
+
 CM.Disp.cookieTimes = [10, 15, 30, 60, 300, 600, 900, 1800];
 CM.Disp.clickTimes = [1, 5, 10, 15, 30];
 
diff --git a/src/Header.js b/src/Header.js
index 26893fb..3731fa3 100644
--- a/src/Header.js
+++ b/src/Header.js
@@ -16,6 +16,8 @@ RunCookieMonsterHeader = function() {
 
     CM.Disp = {};
 
+    CM.Main = {};
+
     CM.Sim = {};
 }
 
diff --git a/src/Main.js b/src/Main.js
index 64abd2c..a941cc0 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -411,6 +411,15 @@ CM.Main.CheckWrinklerCount = function() {
 CM.HasReplaceNativeGrimoireLaunch = false;
 CM.HasReplaceNativeGrimoireDraw = false;
 
+CM.Main.lastGoldenCookieState = 0;
+CM.Main.lastSpawnedGoldenCookieState = 0;
+CM.Main.currSpawnedGoldenCookieState
+CM.Main.lastTickerFortuneState = 0;
+CM.Main.lastSeasonPopupState = 0;
+CM.Main.lastGardenNextStep = 0;
+CM.Main.lastMagicBarFull = 0;
+CM.Main.lastWrinklerCount = 0;
+
 CM.ConfigDefault = {
 	BotBar: 1, 
 	TimerBar: 1,