diff --git a/scripts/gui/thrive_gui.html b/scripts/gui/thrive_gui.html
index df6401edd01..7dea5b48690 100644
--- a/scripts/gui/thrive_gui.html
+++ b/scripts/gui/thrive_gui.html
@@ -372,7 +372,7 @@
 	          <td id="addCytoplasm" class="OrganelleListItem">
                 <span class="tooltiptext">Cytoplasm<hr><br> Cost: 30 mutation points<hr><br> 
                 Performs Process: Glycolysis<br>(0.125 glucose -> 5 ATP)/Second<hr><br>
-                Storage Space: 20<hr><br>
+                Storage Space: 4<hr><br>
                 The material or protoplasm within a living cell.<br>The gooey innards of a cell.</span>
                 <div id="CytoplasmIcon"></div>Cytoplasm<br>30 MP</td>
           </tr></table>
@@ -382,7 +382,7 @@
                 <span class="tooltiptext">
                 Metabolosomes<hr><br> Cost: 45 mutation points<hr><br> 
                 Performs Process: Metabolsome Respiration (In real life they Ferment, but we dont have those compounds in the game yet)<br>(1 Oxygen + 0.7 Glucose -> 38 ATP)/Second (Depending On Environmental Oxygen)<hr><br>
-                Storage Space: 10<hr><br>
+                Storage Space: 1<hr><br>
                 Organelle-like Bacterial microcompartments (BMCs) consisting of a protein shell that encloses enzymes used for fermentation.
                 </span>
                 <div id="MetabolosomeIcon"></div>Metabolosomes<br>45 MP</td>
@@ -391,7 +391,7 @@
                 Chromatophores <hr><br> Cost: 55 mutation points <hr><br> 
                 Performs Process: Chromatophore Photosynthesis<br>(0.09 CO2 -> 0.33 glucose)/Second (Depending On Environmental C02)<br>
                 Performs Process: Glycolysis<br>(0.125 glucose -> 5 ATP)/Second (Depending On Environmental C02)<hr><br>
-                Storage Space: 10<hr><br>
+                Storage Space: 1<hr><br>
                 Coloured, membrane-associated vesicles used by various prokaryotes perform photosynthesis.
                 Chromatophores contain bacteriochlorophyll pigments and carotenoids.</span>
                 <div id="ChromatophorIcon"></div>Chromatophores<br>55 MP</td>
@@ -400,7 +400,7 @@
                 ChemosynthisizingProteins <hr><br> Cost: 45 mutation points <hr><br>
                 Performs Process: Bacterial Chemosynthesis<br>(1 CO2 + 1 Hydrogen Sulfide -> 1 Glucose)/Second (Depending On Environmental C02)<br>
                 Performs Process: Glycolysis<br>(0.125 glucose -> 5 ATP)/Second<hr><br>
-                Storage Space: 20<hr><br>
+                Storage Space: 1<hr><br>
                 Small membrane-associated structures that convert the noxious soup containing hydrogen
                 sulfide from hydrothermal vents into usable energy in the form of glucose.</span>
                 <div id="ChemosynthisizingProteinsIcon"></div>Chemosynthisizing Proteins<br>45 MP</td>
@@ -409,8 +409,8 @@
 	        <td id="addRusticyanin" class="OrganelleListItem">
               <span class="tooltiptext">
                 Rusticyanin <hr><br> Cost: 45 mutation points <hr><br>
-                Performs Process: Iron Chemolithotrophy<br>(0.09 CO2 + 0.175 Iron Ion -> 10 ATP)/Second (Depending On Environmental C02)<br>
-                Storage Space: 5<hr><br>
+                Performs Process: Iron Chemolithotrophy<br>(0.09 CO2 + 0.175 Iron Ion -> 10 ATP)/Second (Depending On Environmental C02)<hr><br>
+                Storage Space: 1<hr><br>
                 Siderophores and Rusticyanin for storing and using iron ions and carbon from atmospheric carbon dioxide to produce ATP.
                 Iron Chemolithotrophy is a process by which organisms obtain their energy from the oxidation of reduced inorganic ions.
               </span>
@@ -422,6 +422,7 @@
                 <span class="tooltiptext">
                 Flagellum<hr><br> Cost: 55 mutation points<hr><br> 
                 Performs Process: Movement<br>(7atp -> Faster movement speed)/Second<hr><br>
+                Storage Space: 1<hr><br>
                 A whip like structure used by microbes for movement.</span>
                 <div id="FlagellumIcon"></div>Flagellum<br>55 MP</td>
             <td id="addPilus" class="OrganelleListItem DisabledButton">
@@ -435,6 +436,7 @@
                 <span class="tooltiptext">
                 Nucleus<hr><br> Cost: 100 mutation points<hr><br>
                 Performs Process: Eukaryote Evolution<hr><br>
+                Storage Space: 15<hr><br>
                 Allows for synthesis of RNA and MRNA, allows cell to evolve membrane bound organelles.
                 </span>
                 <div id="NucleusIcon">
@@ -443,6 +445,7 @@
                 <span class="tooltiptext">
                 Mitochondria<hr><br> Cost: 45 mutation points<hr><br> 
                 Performs Process: Respiration<br>(1 Oxygen + 0.2 glucose -> 38 ATP)/Second (Depending On Environmental Oxygen)<hr><br>
+                Storage Space: 2<hr><br>
                 A captured prokaryote used by eukaryotic cells to perform respiration.<br>
                 - The Mitochondria is the powerhouse of the cell
                 </span>
@@ -452,6 +455,7 @@
                 <span class="tooltiptext">
                 Chloroplast<hr><br> Cost: 55 mutation points<hr><br> 
                 Performs Process: Photosynthesis<br>( 0.09 CO2 -> 1 glucose)/Second (Depending On Environmental C02)<hr><br>
+                Storage Space: 2<hr><br>
                 A captured prokaryote used by eukaryotic cells to perform photosynthesis.<br>
                 The chloroplast is used primarily by plant cells on earth, but some ciliates and other organisms use it too.
                 </span>
@@ -461,6 +465,7 @@
                 <span class="tooltiptext">
                 Thermoplast<hr><br> Cost: 40 mutation points<hr><br> 
                 Performs Process: Thermosynthesis<br>(Heat -> 1 glucose)/Second (Depending On Environmental Heat)<hr><br>
+                Storage Space: 2<hr><br>
                 A captured prokaryote used by eukaryotic cells to perform thermosynthesis.<br>
                 The thermoplast is a theoretical organelle that takes environmental heat gradients and generates energy from them.
                 </span>
@@ -469,6 +474,7 @@
                 <span class="tooltiptext">
                 Chemoplast<hr><br> Cost: 45 mutation points<hr><br> 
                 Performs Process: Chemosynthesis<br>(0.09 CO2 + 1 Hydrogen Sulfide -> 2 Glucose)/Second (Depending On Environmental C02)<hr><br>
+                Storage Space: 2<hr><br>
                 Allows for synthesis of glucose from hydrogen sulfide and atmospheric carbon dioxide.
                 <br>
                 Can be used to process the normally toxic soup containing hydrogen sulfide that comes out of hydrothermal vents at the bottom of the ocean. Into glucose.
@@ -478,6 +484,7 @@
                 <span class="tooltiptext">
                 Nitrogen Fixing Plastid<hr><br> Cost: 50 mutation points<hr><br> 
                 Performs Process: Nitrogen Fixation<br>(1 Oxygen + 5 ATP -> 0.5 Ammonia)/Second (Depending On Environmental Oxygen)<hr><br>
+                Storage Space: 2<hr><br>
                 Allows for synthesis of ammonia from atmospheric nitrogen and oxygen. For easier cell growth.
                 </span>
                 <div id="PlastidIcon">
@@ -486,13 +493,14 @@
              <td id="addVacuole" class="OrganelleListItem">
                 <span class="tooltiptext">
                 Vacuole <hr><br> Cost: 50 mutation points<hr><br> 
-                Storage Space: 50<hr><br>
+                Storage Space: 15<hr><br>
                 A space or vesicle within the cytoplasm of a cell, enclosed by a membrane and used to hold compounds.</span>
                 <div id="VacuoleIcon"></div>Vacuole<br>50 MP</td>
             <td id="addToxinVacuole" class="OrganelleListItem">
                 <span class="tooltiptext">
                 Toxin Vacuole <hr><br> Cost: 70 mutation points<hr><br> 
                 Performs Process: OxytoxyNT Production<br>(1 Oxygen + 5 ATP -> 5 Oxytoxy)/Second (Depending On Environmental Oxygen)<hr><br>
+                Storage Space: 5<hr><br>
                 Allows for production and storage of OxytoxyNT which can be shot at enemy cells using E. The more of this organelle you have the faster your toxin fire rate will be.
                 </span>
                 <div id="ToxinVacuoleIcon"></div>Toxin Vacuole<br>70 MP</td>
diff --git a/scripts/microbe_stage/microbe_ai.as b/scripts/microbe_stage/microbe_ai.as
index 4f40b33825c..ddee627fc6c 100644
--- a/scripts/microbe_stage/microbe_ai.as
+++ b/scripts/microbe_stage/microbe_ai.as
@@ -337,7 +337,7 @@ class MicrobeAISystem : ScriptSystem{
                 }
 
             }
-            
+
     return chosenChunk;
     }
 
@@ -685,7 +685,7 @@ class MicrobeAISystem : ScriptSystem{
             {
             aiComponent.lifeState = SCAVENGING_STATE;
             aiComponent.boredom = 0;
-            }    
+            }
        else if (rollCheck(aiComponent.speciesActivity,500.0f))
             {
             aiComponent.lifeState = PLANTLIKE_STATE;
diff --git a/scripts/microbe_stage/organelle_table.as b/scripts/microbe_stage/organelle_table.as
index f1a2b0bbc2e..5489685cda1 100644
--- a/scripts/microbe_stage/organelle_table.as
+++ b/scripts/microbe_stage/organelle_table.as
@@ -263,8 +263,8 @@ void setupOrganelles(){
     };
     nucleusParameters.components = {
         nucleusComponentFactory,
-    // Cell takes up 10 spaces, so 50 cytoplasm
-    storageOrganelleFactory(55.0f)
+    // Same storage as vacuole
+    storageOrganelleFactory(15.0f)
     };
     nucleusParameters.processes = {
     };
@@ -300,7 +300,7 @@ void setupOrganelles(){
     };
     cytoplasmParameters.components = {
         processorOrganelleFactory(1.0),
-        storageOrganelleFactory(20.0f)
+        storageOrganelleFactory(4.0f)
     };
     cytoplasmParameters.processes = {
         TweakedProcess("glycolosis", 1)
@@ -327,8 +327,8 @@ void setupOrganelles(){
     };
     chloroplastParameters.components = {
         processorOrganelleFactory(1.0),
-    //chloroplast takes 3 hexes, so allowed storage of 3 cytooplasm
-    storageOrganelleFactory(15.0f)
+    //chloroplast takes 3 hexes, so allowed storage of 1 cytoplasm
+    storageOrganelleFactory(2.0f)
     };
     chloroplastParameters.processes = {
         TweakedProcess("photosynthesis", 1)
@@ -357,7 +357,8 @@ void setupOrganelles(){
     };
     oxytoxyParameters.components = {
     //this can't hold since it is a vacuole
-        agentVacuoleFactory("oxytoxy", "oxytoxySynthesis")
+        agentVacuoleFactory("oxytoxy", "oxytoxySynthesis"),
+        storageOrganelleFactory(5.0f)
     };
     oxytoxyParameters.processes = {
         TweakedProcess("oxytoxySynthesis", 1)
@@ -385,8 +386,8 @@ void setupOrganelles(){
     };
     mitochondrionParameters.components = {
         processorOrganelleFactory(1.0f),
-        // Mitochondria takes 2 hexes, so allowed storage of 2 cytooplasm
-    storageOrganelleFactory(10.0f)
+        // Mitochondria takes 2 hexes, so allowed storage of 1 cytooplasm
+        storageOrganelleFactory(2.0f)
     };
     mitochondrionParameters.processes = {
         TweakedProcess("respiration", 1)
@@ -413,7 +414,7 @@ void setupOrganelles(){
         {"ammonia", 2}
     };
     vacuoleParameters.components = {
-        storageOrganelleFactory(40.0f)
+        storageOrganelleFactory(15.0f)
     };
 
     vacuoleParameters.processes = {
@@ -442,7 +443,7 @@ void setupOrganelles(){
     flagellumParameters.components = {
         movementOrganelleFactory(20, 300),
     // Flagella takes 1 hex, so allowed storage of 1 cytooplasm
-    storageOrganelleFactory(5.0f)
+    storageOrganelleFactory(1.0f)
     };
 
     flagellumParameters.processes = {
@@ -471,8 +472,8 @@ void setupOrganelles(){
     };
     chemoplast.components = {
         processorOrganelleFactory(1.0f),
-    // Chemoplast takes 2 hexes, so allowed storage of 2 cytooplasm
-    storageOrganelleFactory(10.0f)
+    // Chemoplast takes 2 hexes, so allowed storage of 1 cytooplasm
+    storageOrganelleFactory(2.0f)
     };
     chemoplast.processes = {
           TweakedProcess("chemoSynthesis", 1)
@@ -500,8 +501,8 @@ void setupOrganelles(){
     };
     nitrogenPlastid.components = {
         processorOrganelleFactory(1.0f),
-        // nitrogenPlastid takes 2 hexes, so allowed storage of 2 cytooplasm
-        storageOrganelleFactory(10.0f)
+        // nitrogenPlastid takes 2 hexes, so allowed storage of 1 cytooplasm
+        storageOrganelleFactory(2.0f)
     };
     nitrogenPlastid.processes = {
           TweakedProcess("nitrogenFixing", 1)
@@ -530,7 +531,7 @@ void setupOrganelles(){
     };
     respiratoryProtein.components = {
         processorOrganelleFactory(1.0f),
-        storageOrganelleFactory(10.0f)
+        storageOrganelleFactory(1.0f)
     };
     respiratoryProtein.processes = {
         TweakedProcess("protein_respiration", 1)
@@ -556,7 +557,7 @@ void setupOrganelles(){
     };
     photosyntheticProtein.components = {
         processorOrganelleFactory(1.0f),
-        storageOrganelleFactory(10.0f)
+        storageOrganelleFactory(1.0f)
     };
     photosyntheticProtein.processes = {
       TweakedProcess("chromatophore_photosynthesis", 1),
@@ -583,7 +584,7 @@ void setupOrganelles(){
     };
     oxytoxyProtein.components = {
         agentVacuoleFactory("oxytoxy", "oxytoxySynthesis"),
-        storageOrganelleFactory(25.0f),
+        storageOrganelleFactory(2.0f),
         processorOrganelleFactory(1.0f)
     };
     oxytoxyProtein.processes = {
@@ -612,7 +613,7 @@ void setupOrganelles(){
     };
     chemoSynthisizingProtein.components = {
         processorOrganelleFactory(1.0f),
-        storageOrganelleFactory(20.0f)
+        storageOrganelleFactory(1.0f)
     };
     chemoSynthisizingProtein.processes = {
       TweakedProcess("bacterial_ChemoSynthesis", 1),
@@ -639,7 +640,7 @@ void setupOrganelles(){
     };
     protoplasmParameters.components = {
         processorOrganelleFactory(1.0),
-        storageOrganelleFactory(50.0f)
+        storageOrganelleFactory(15.0f)
     };
     protoplasmParameters.processes = {
         TweakedProcess("glycolosis", 1)
@@ -665,7 +666,7 @@ void setupOrganelles(){
     };
     nitrogenFixationProtein.components = {
         processorOrganelleFactory(1.0f),
-        storageOrganelleFactory(25.0f)
+        storageOrganelleFactory(2.0f)
     };
     nitrogenFixationProtein.processes = {
       TweakedProcess("nitrogenFixing", 1),
@@ -692,10 +693,10 @@ void setupOrganelles(){
     };
     rusticyanin.components = {
         processorOrganelleFactory(1.0f),
-        storageOrganelleFactory(5.0f)
+        storageOrganelleFactory(1.0f)
     };
     rusticyanin.processes = {
-      TweakedProcess("iron_chemolithoautotrophy", 1)
+      TweakedProcess("iron_chemolithoautotrophy", 2)
     };
     rusticyanin.hexes = {
         Int2(0, 0),