diff --git a/DLL_Project/Buildings/Building_AutomatedFactory.cs b/DLL_Project/Buildings/Building_AutomatedFactory.cs
index 668b286..8097929 100644
--- a/DLL_Project/Buildings/Building_AutomatedFactory.cs
+++ b/DLL_Project/Buildings/Building_AutomatedFactory.cs
@@ -1,4 +1,9 @@
-using System;
+// Enable this define to do a whole bunch of debug logging
+#if DEVELOPER
+//#define _I_AM_A_POTATO_
+#endif
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -559,7 +564,7 @@ private void                        RescanTick()
 
         public void                         ResetAndReprogramHoppers()
         {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
             CCL_Log.Message(
                 string.Format( "{0}\n{1}", this.ThingID, Environment.StackTrace ),
                 "Building_AutomatedFactory.ResetAndReprogramHoppers()"
@@ -1238,7 +1243,7 @@ public bool                         ConsiderFor( ThingDef product, Pawn pawn )
             {
                 if( consideration.ConsideredBy != pawn )
                 {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                     CCL_Log.Message(
                         string.Format(
                             "{0} could not consider {1} for {2} because it is already reserved by {3} for {4}\n{5}",
@@ -1256,7 +1261,7 @@ public bool                         ConsiderFor( ThingDef product, Pawn pawn )
                 }
             }
             consideration = new Consideration( pawn, product );
-#if DEVELOPER
+#if _I_AM_A_POTATO_
             CCL_Log.Message(
                 string.Format( "{0} is now considering {1} for {2}\n{3}", pawn.LabelShort, this.ThingID, product.defName, Environment.StackTrace ),
                 "Building_AutomatedFactory.ConsiderFor"
@@ -1335,7 +1340,7 @@ public bool                         ReserveForUseBy( Pawn pawn, ThingDef product
             {
                 if( consideration.ConsideredBy != pawn )
                 {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                     CCL_Log.Message(
                         string.Format(
                             "{0} could not reserve {1} for {2} because it is already reserved by {3} for {4}\n{5}",
@@ -1353,7 +1358,7 @@ public bool                         ReserveForUseBy( Pawn pawn, ThingDef product
                 }
             }
             consideration = new Consideration( pawn, product, true );
-#if DEVELOPER
+#if _I_AM_A_POTATO_
             CCL_Log.Message(
                 string.Format( "{0} has now reserved {1} for {2}\n{3}", pawn.LabelShort, this.ThingID, product.defName, Environment.StackTrace ),
                 "Building_AutomatedFactory.ReserveForUseBy"
@@ -1367,7 +1372,7 @@ public bool                         ReserveForUseBy( Pawn pawn, ThingDef product
 
         private void                        ReleaseFromUseByInt( Pawn pawn, bool releaseFromManager = false )
         {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
             CCL_Log.Message(
                 string.Format(
                     "{0} is no longer reserving {1} for {2}\n{3}",
@@ -1393,7 +1398,7 @@ public void                         ReleaseFromUseBy( Pawn pawn, bool releaseFro
         {
             if( !IsReservedBy( pawn ) )
             {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                 CCL_Log.Message(
                     string.Format(
                         "{0} could not release {1} because it is reserved by {2}\n{3}",
@@ -1415,7 +1420,7 @@ public Thing                        TryProduceAndReleaseFor( Pawn pawn, bool rel
             //Log.Message( string.Format( "{0}.TryProduceAndReleaseBy( {1} )", this.ThingID, pawn == null ? "null" : pawn.NameStringShort ) );
             if( !IsReservedBy( pawn ) )
             {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                 CCL_Log.Message(
                     string.Format(
                         "{0} could not take from and release {1} because it is reserved by {2}\n{3}",
diff --git a/DLL_Project/Classes/Static/CCL_Log.cs b/DLL_Project/Classes/Static/CCL_Log.cs
index 4b3d004..99e7e34 100644
--- a/DLL_Project/Classes/Static/CCL_Log.cs
+++ b/DLL_Project/Classes/Static/CCL_Log.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Collections.Generic;
 
 using System.Text;
 using Verse;
@@ -19,6 +20,13 @@ public class LogStream
             public int                      indent;
         }
 
+        private enum MessageClass
+        {
+            Message,
+            Warning,
+            Error
+        }
+
         public const string                 cclLogFileName = "ccl_log.txt";
         private static LogStream            cclStream;
 
@@ -105,9 +113,9 @@ public static void                  Write( string s, LogStream stream = null )
         }
 #endif
 
-        public static bool                  AppendSection( ref StringBuilder s, string str, bool addSectionDivider = true )
+        public static bool                  AppendSection( ref StringBuilder s, string str, bool prependSectionDivider = true )
         {
-            if( addSectionDivider )
+            if( prependSectionDivider )
             {
                 s.Append( " :: " );
             }
@@ -115,9 +123,9 @@ public static bool                  AppendSection( ref StringBuilder s, string s
             return true;
         }
 
-        public static bool                  AppendSectionNewLine( ref StringBuilder s, string str, bool addSectionDivider = true )
+        public static bool                  AppendSectionNewLine( ref StringBuilder s, string str, bool prependSectionDivider = true )
         {
-            if( addSectionDivider )
+            if( prependSectionDivider )
             {
                 s.Append( " :: " );
             }
@@ -165,16 +173,33 @@ private static void                 AppendTrace( ref StringBuilder s, ModContent
         }
         */
 
-        public static StringBuilder         BaseMessage( string content = null, string category = null )
+        private static StringBuilder         BaseMessage( string content = null, string category = null, MessageClass messageClass = MessageClass.Message )
         {
             var s = new StringBuilder();
             s.Append( Controller.Data.UnityObjectName );
 
+            if(
+                ( Current.Game != null )&&
+                ( Find.TickManager != null )
+            )
+            {
+                AppendSection( ref s, string.Format( "TicksGame = {0}", Find.TickManager.TicksGame ) );
+            }
+
             if( category != null )
             {
                 AppendSection( ref s, category );
             }
 
+            if( messageClass == MessageClass.Error )
+            {
+                AppendSection( ref s, "(Error)" );
+            }
+            if( messageClass == MessageClass.Warning )
+            {
+                AppendSection( ref s, "(Warning)" );
+            }
+
             if( content != null )
             {
                 AppendSection( ref s, content );
@@ -183,33 +208,38 @@ public static StringBuilder         BaseMessage( string content = null, string c
             return s;
         }
 
+        private static List<StringBuilder>  captureStack = new List<StringBuilder>();
         private static StringBuilder        captureTarget = null;
         private static Verbosity            captureVerbosity = Verbosity.Default;
 
         public static bool                  CaptureBegin( StringBuilder target )
         {
-            if( captureTarget == null )
+            if( target == null )
             {
-                captureTarget = target;
-                captureVerbosity = Verbosity.Default;
-                return true;
+                CCL_Log.Error( "Cannot set CaptureBegin( target ) to null", "Log Capture" );
+                return false;
             }
-            if( captureTarget == target )
+            if( captureStack.Contains( target ) )
             {
-                CCL_Log.Error( "Already capturing log", "Log Capture" );
+                captureTarget = target;
                 return true;
             }
-            return false;
+            captureStack.Insert( 0, target );
+            captureTarget = captureStack[ 0 ];
+            return true;
         }
 
         public static bool                  CaptureEnd( StringBuilder target, string status = "" )
         {
-            if( captureTarget == null )
+            if( captureStack.NullOrEmpty() )
             {
                 CCL_Log.Error( "Log isn't being captured, no need to end capture", "Log Capture" );
-                return true;
+                return false;
             }
-            if( captureTarget != target )
+            if(
+                ( captureStack[ 0 ] != target )&&
+                ( captureTarget != target )
+            )
             {
                 CCL_Log.Error( "Cannot end a capture on a different object", "Log Capture" );
                 return false;
@@ -217,7 +247,14 @@ public static bool                  CaptureEnd( StringBuilder target, string sta
             var captureStatus = status + "\n";
             captureTarget.Insert( 0, captureStatus );
             captureVerbosity = Verbosity.Default;
-            captureTarget = null;
+            if( captureStack[ 0 ] == target )
+            {
+                captureStack.RemoveAt( 0 );
+            }
+            if( captureTarget == target )
+            {
+                captureTarget = captureStack.Count > 0 ? captureStack[ 0 ] : null;
+            }
             return true;
         }
 
@@ -241,7 +278,7 @@ public static void                  Message( string content, string category = n
                 bool prefixNext = false;
                 if( category != null )
                 {
-                    prefixNext = AppendSection( ref s, category, false );
+                    prefixNext = AppendSection( ref s, category, prefixNext );
                 }
                 AppendSectionNewLine( ref s, content, prefixNext );
             }
@@ -255,7 +292,7 @@ public static void                  Error( string content, string category = nul
             var s = captureTarget;
             if( s == null )
             {
-                s = BaseMessage( content, category );
+                s = BaseMessage( content, category, MessageClass.Error );
                 Verse.Log.Error( s.ToString() );
 #if DEBUG
                 Write( s.ToString() );
@@ -264,10 +301,36 @@ public static void                  Error( string content, string category = nul
             else
             {
                 s.Append( "\t" );
-                bool prefixNext = false;
+                bool prefixNext = AppendSection( ref s, "(Error)", false );
+                if( category != null )
+                {
+                    prefixNext = AppendSection( ref s, category, prefixNext );
+                }
+                AppendSectionNewLine( ref s, content, prefixNext );
+            }
+        }
+
+        /// <summary>
+        /// Write a warning => Community Core Library :: category(nullable) :: content
+        /// </summary>
+        public static void                  Warning( string content, string category = null )
+        {
+            var s = captureTarget;
+            if( s == null )
+            {
+                s = BaseMessage( content, category, MessageClass.Warning );
+                Verse.Log.Warning( s.ToString() );
+#if DEBUG
+                Write( s.ToString() );
+    #endif
+            }
+            else
+            {
+                s.Append( "\t" );
+                bool prefixNext = AppendSection( ref s, "(Warning)", false );
                 if( category != null )
                 {
-                    prefixNext = AppendSection( ref s, category, false );
+                    prefixNext = AppendSection( ref s, category, prefixNext );
                 }
                 AppendSectionNewLine( ref s, content, prefixNext );
             }
diff --git a/DLL_Project/Classes/Static/HelpBuilder.cs b/DLL_Project/Classes/Static/HelpBuilder.cs
index 7dc08ba..9aaa8ed 100644
--- a/DLL_Project/Classes/Static/HelpBuilder.cs
+++ b/DLL_Project/Classes/Static/HelpBuilder.cs
@@ -446,7 +446,7 @@ static void ResolveAdvancedResearch()
             // Get advanced research database
             var advancedResearchDefs =
                 Controller.Data.AdvancedResearchDefs.Where( a => (
-                    ( a.ResearchConsolidator == a )&&
+                    ( a.HelpConsolidator == a )&&
                     ( a.HasHelp )
                 ) ).ToList();
 
diff --git a/DLL_Project/CommunityCoreLibrary.csproj b/DLL_Project/CommunityCoreLibrary.csproj
index 774feff..3400dfc 100644
--- a/DLL_Project/CommunityCoreLibrary.csproj
+++ b/DLL_Project/CommunityCoreLibrary.csproj
@@ -262,7 +262,7 @@
     <Compile Include="Detours\ThingListGroupHelper.cs" />
     <Compile Include="Detours\GenConstruct.cs" />
     <Compile Include="Detours\WorkGiver_Warden_DeliverFood.cs" />
-    <Compile Include="Detours\PreLoadUtility.cs" />
+    <Compile Include="Detours\RootMap.cs" />
     <Compile Include="Detours\PageUtility.cs" />
     <Compile Include="SpecialInjectors\PostLoadInjectorTest.cs" />
     <Compile Include="Detours\ModLister.cs" />
@@ -337,6 +337,10 @@
     <Compile Include="Extensions\JoyGiver_TakeDrug_Extensions.cs" />
     <Compile Include="Detours\DrugAIUtility.cs" />
     <Compile Include="Detours\JoyGiver.cs" />
+    <Compile Include="Detours\Debug\MapPawns.cs" />
+    <Compile Include="Detours\Debug\ListerThings.cs" />
+    <Compile Include="Extensions\ThingRequestGroup_Extensions.cs" />
+    <Compile Include="Detours\Game.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -355,4 +359,7 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Detours\Debug\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/DLL_Project/Controller/Library.cs b/DLL_Project/Controller/Library.cs
index 945d506..1aa9f00 100644
--- a/DLL_Project/Controller/Library.cs
+++ b/DLL_Project/Controller/Library.cs
@@ -166,43 +166,6 @@ internal static bool                IsInGoodState
             }
         }
 
-        internal static void                Restart()
-        {
-            if( !IsInGoodState )
-            {
-                CCL_Log.Error( "Library is not in a valid state but 'Library.Restart' was called!" );
-                return;
-            }
-
-            // Call controller Initialize() on game load
-            var subControllers = Controller.Data.SubControllers.ToList();
-            subControllers.Sort( (x,y) => ( x.InitializationPriority > y.InitializationPriority ) ? -1 : 1 );
-
-            foreach( var subsys in subControllers )
-            {
-                if( subsys.InitializationPriority != SubController.DontProcessThisPhase )
-                {
-                    if(
-                        ( subsys.State >= SubControllerState._BaseOk )&&
-                        ( subsys.ReinitializeOnGameLoad )
-                    )
-                    {
-                        if( !subsys.Initialize() )
-                        {
-                            CCL_Log.Error( subsys.strReturn, subsys.Name + " :: Reinitialization" );
-                            Controller.Data.LibraryOk = false;
-                            return;
-                        }
-                        if( subsys.strReturn != string.Empty )
-                        {
-                            CCL_Log.Message( subsys.strReturn, subsys.Name + " :: Reinitialization" );
-                        }
-                    }
-                }
-            }
-            Controller.Data.LibraryTicks = 0;
-        }
-
     }
 
 }
diff --git a/DLL_Project/Controller/MainMonoBehaviour.cs b/DLL_Project/Controller/MainMonoBehaviour.cs
index 00a8ca2..a39a963 100644
--- a/DLL_Project/Controller/MainMonoBehaviour.cs
+++ b/DLL_Project/Controller/MainMonoBehaviour.cs
@@ -54,10 +54,6 @@ public void                         FixedUpdate()
                 return;
             }
 
-            if( Scribe.mode == LoadSaveMode.LoadingVars )
-            {
-                LongEventHandler.QueueLongEvent( Controller.Library.Restart, "Initializing", true, null );
-            }
             if( Scribe.mode != LoadSaveMode.Inactive )
             {
                 // Do nothing while a save/load sequence is happening
diff --git a/DLL_Project/Controller/SubControllers.cs b/DLL_Project/Controller/SubControllers.cs
index e081afe..bcbf68d 100644
--- a/DLL_Project/Controller/SubControllers.cs
+++ b/DLL_Project/Controller/SubControllers.cs
@@ -142,6 +142,100 @@ internal static void                Update()
 
         }
 
+        internal static void                PreLoad()
+        {
+            CCL_Log.Trace(
+                Verbosity.Injections,
+                "PreLoad()",
+                "SubControllers" );
+            // Call controller PreLoad() on game load
+            var subControllers = Controller.Data.SubControllers.ToList();
+            subControllers.Sort( (x,y) => ( x.GameLoadPriority > y.GameLoadPriority ) ? -1 : 1 );
+
+            foreach( var subsys in subControllers )
+            {
+                if( subsys.GameLoadPriority != SubController.DontProcessThisPhase )
+                {
+                    if( subsys.State >= SubControllerState._BaseOk )
+                    {
+                        if( !subsys.PreLoad() )
+                        {
+                            CCL_Log.Error( subsys.strReturn, subsys.Name + " :: PreLoad" );
+                            Controller.Data.LibraryOk = false;
+                            return;
+                        }
+                        if( subsys.strReturn != string.Empty )
+                        {
+                            CCL_Log.Message( subsys.strReturn, subsys.Name + " :: PreLoad" );
+                        }
+                    }
+                }
+            }
+            Controller.Data.LibraryTicks = 0;
+        }
+
+        internal static void                PreThingLoad()
+        {
+            CCL_Log.Trace(
+                Verbosity.Injections,
+                "PreThingLoad()",
+                "SubControllers" );
+            // Call controller PostSmallComponentExposeData() on game load
+            var subControllers = Controller.Data.SubControllers.ToList();
+            subControllers.Sort( (x,y) => ( x.GameLoadPriority > y.GameLoadPriority ) ? -1 : 1 );
+
+            foreach( var subsys in subControllers )
+            {
+                if( subsys.GameLoadPriority != SubController.DontProcessThisPhase )
+                {
+                    if( subsys.State >= SubControllerState._BaseOk )
+                    {
+                        if( !subsys.PreThingLoad() )
+                        {
+                            CCL_Log.Error( subsys.strReturn, subsys.Name + " :: PreThingLoad" );
+                            Controller.Data.LibraryOk = false;
+                            return;
+                        }
+                        if( subsys.strReturn != string.Empty )
+                        {
+                            CCL_Log.Message( subsys.strReturn, subsys.Name + " :: PreThingLoad" );
+                        }
+                    }
+                }
+            }
+        }
+
+        internal static void                PostLoad()
+        {
+            CCL_Log.Trace(
+                Verbosity.Injections,
+                "PostLoad()",
+                "SubControllers" );
+            // Call controller PostLoad() on game load
+            var subControllers = Controller.Data.SubControllers.ToList();
+            subControllers.Sort( (x,y) => ( x.GameLoadPriority > y.GameLoadPriority ) ? -1 : 1 );
+
+            foreach( var subsys in subControllers )
+            {
+                if( subsys.GameLoadPriority != SubController.DontProcessThisPhase )
+                {
+                    if( subsys.State >= SubControllerState._BaseOk )
+                    {
+                        if( !subsys.PostLoad() )
+                        {
+                            CCL_Log.Error( subsys.strReturn, subsys.Name + " :: PostLoad" );
+                            Controller.Data.LibraryOk = false;
+                            return;
+                        }
+                        if( subsys.strReturn != string.Empty )
+                        {
+                            CCL_Log.Message( subsys.strReturn, subsys.Name + " :: PostLoad" );
+                        }
+                    }
+                }
+            }
+        }
+
     }
 
 }
diff --git a/DLL_Project/Controller/SubControllers/InjectionSubController.cs b/DLL_Project/Controller/SubControllers/InjectionSubController.cs
index 2f38e7e..ca857e2 100644
--- a/DLL_Project/Controller/SubControllers/InjectionSubController.cs
+++ b/DLL_Project/Controller/SubControllers/InjectionSubController.cs
@@ -43,7 +43,7 @@ static                              InjectionSubController()
         // Override sequence priorities
         public override int                 ValidationPriority      =>  90;
         public override int                 InitializationPriority  => 100;
-        public override int                 UpdatePriority          => 100;
+        public override int                 GameLoadPriority        => 100;
 
         public override bool                Validate()
         {
@@ -100,6 +100,7 @@ public override bool                Initialize()
                 );
                 strReturn = stringBuilder.ToString();
                 State = SubControllerState.InitializationError;
+                return false;
             }
 
             // Everything's ok for updates
@@ -108,14 +109,14 @@ public override bool                Initialize()
                 "Initialized"
             );
             strReturn = stringBuilder.ToString();
-            State = SubControllerState.Ok;
+            State = SubControllerState.Hybernating;
 
             LongEventHandler.SetCurrentEventText( "Initializing".Translate() );
 
             return true;
         }
 
-        public override bool                Update()
+        public override bool                PreThingLoad()
         {
             var stringBuilder = new StringBuilder();
             CCL_Log.CaptureBegin( stringBuilder );
@@ -129,6 +130,7 @@ public override bool                Update()
                 );
                 strReturn = stringBuilder.ToString();
                 State = SubControllerState.RuntimeError;
+                return false;
             }
 
             // Post-load injections complete, stop calling this
diff --git a/DLL_Project/Controller/SubControllers/ResearchSubController.cs b/DLL_Project/Controller/SubControllers/ResearchSubController.cs
index b2f544a..7f9eba4 100644
--- a/DLL_Project/Controller/SubControllers/ResearchSubController.cs
+++ b/DLL_Project/Controller/SubControllers/ResearchSubController.cs
@@ -15,12 +15,24 @@ namespace CommunityCoreLibrary.Controller
 	internal class ResearchSubController : SubController
 	{
 
+        private class OriginalDefData
+        {
+            public Dictionary<ThingDef,List<string>>                        ThingDef_SowTags                    = new Dictionary<ThingDef, List<string>>();
+            public Dictionary<ThingDef,List<RecipeDef>>                     ThingDef_Recipes                    = new Dictionary<ThingDef, List<RecipeDef>>();
+            public Dictionary<ThingDef,List<ResearchProjectDef>>            ThingDef_ResearchPrerequisites      = new Dictionary<ThingDef, List<ResearchProjectDef>>();
+            public Dictionary<RecipeDef,List<ThingDef>>                     RecipeDef_RecipeUsers               = new Dictionary<RecipeDef, List<ThingDef>>();
+            public Dictionary<ResearchProjectDef,List<ResearchProjectDef>>  ResearchDef_ResearchPrerequisites   = new Dictionary<ResearchProjectDef, List<ResearchProjectDef>>();
+        }
+
         // These are used to optimize the process so the same data
         // isn't constantly reprocessed with every itteration.
         private static List< ThingDef >     buildingCache;
         private static List< HelpCategoryDef > helpCategoryCache;
         private static List< AdvancedResearchMod > researchModCache;
 
+        // This is to store the effected defs original data in
+        private static OriginalDefData      OriginalData;
+
         // Was god-mode on the last update?
         private bool                        wasGodMode;
 
@@ -33,35 +45,10 @@ public override string              Name
         }
 
         // Override sequence priorities
-        public override int                 ValidationPriority
-        {
-            get
-            {
-                return 50;
-            }
-        }
-        public override int                 InitializationPriority
-        {
-            get
-            {
-                return 90;
-            }
-        }
-        public override int                 UpdatePriority
-        {
-            get
-            {
-                return 50;
-            }
-        }
-
-        public override bool                ReinitializeOnGameLoad
-        {
-            get
-            {
-                return true;
-            }
-        }
+        public override int                 ValidationPriority      => 50;
+        public override int                 InitializationPriority  => 90;
+        public override int                 UpdatePriority          => 50;
+        public override int                 GameLoadPriority        => 90;
 
         // Validate ...research...?
 		public override bool                Validate ()
@@ -150,7 +137,26 @@ public override bool                Initialize ()
             // Create caches
             InitializeCaches();
 
-            // Set the initial state
+            // Get the initial state
+            GetInitialState();
+
+            // Upgrade system state
+            strReturn = "Initialized";
+            State = Controller.SubControllerState.Ok;
+            return true;
+        }
+
+        public override bool                PreLoad()
+        {
+            if( Data.AdvancedResearchDefs.NullOrEmpty() )
+            {
+                // No advanced research, hybernate
+                strReturn = "No advanced research defined, hybernating...";
+                State = Controller.SubControllerState.Hybernating;
+                return true;
+            }
+
+            // Reset the initial state
             SetInitialState( true );
 
             // Upgrade system state
@@ -159,6 +165,18 @@ public override bool                Initialize ()
             return true;
         }
 
+        public override bool                PreThingLoad()
+        {
+            // Don't display an update message
+            strReturn = string.Empty;
+
+            // Everything is good, do some work
+            wasGodMode = false;
+
+            CheckAdvancedResearch();
+            return true;
+        }
+
         public override bool                Update()
         {
             // Don't display an update message
@@ -178,6 +196,7 @@ private void                        InitializeCaches()
             buildingCache = new List< ThingDef >();
             helpCategoryCache = new List<HelpCategoryDef>();
             researchModCache = new List< AdvancedResearchMod >();
+            OriginalData = new OriginalDefData();
         }
 
         private void                        PrepareCaches()
@@ -227,7 +246,7 @@ private void                        ProcessCaches( bool setInitialState = false
 
         public void                         CheckAdvancedResearch()
         {
-            if (
+            if(
                 ( !DebugSettings.godMode )&&
                 ( wasGodMode )
             )
@@ -241,12 +260,12 @@ public void                         CheckAdvancedResearch()
             PrepareCaches();
 
             // Scan advanced research for newly completed projects
-            foreach ( var Advanced in Data.AdvancedResearchDefs )
+            foreach( var Advanced in Data.AdvancedResearchDefs )
             {
-                if ( Advanced.ResearchState != ResearchEnableMode.Complete )
+                if( Advanced.ResearchState != ResearchEnableMode.Complete )
                 {
                     var enableMode = Advanced.EnableMode;
-                    if ( enableMode != Advanced.ResearchState )
+                    if( enableMode != Advanced.ResearchState )
                     {
                         // Enable this project
                         Advanced.Enable( enableMode );
@@ -258,24 +277,164 @@ public void                         CheckAdvancedResearch()
             ProcessCaches();
         }
 
+        private void                        GetInitialState()
+        {
+            // Process each advanced research def
+            foreach( var Advanced in Data.AdvancedResearchDefs )
+            {
+                if( Advanced.IsPlantToggle )
+                {   // Handle plants sow tags
+                    foreach( var plantDef in Advanced.thingDefs )
+                    {
+                        if( !OriginalData.ThingDef_SowTags.ContainsKey( plantDef ) )
+                        {
+                            // Add plant to dictionary with their original list of sowTags
+                            var sowTags = new List<string>();
+                            if( !plantDef.plant.sowTags.NullOrEmpty() )
+                            {
+                                sowTags.AddRange( plantDef.plant.sowTags );
+                            }
+                            OriginalData.ThingDef_SowTags[ plantDef ] = sowTags;
+                        }
+                    }
+                }
+                if( Advanced.IsRecipeToggle )
+                {   // Handle recipe toggles
+                    foreach( var thingDef in Advanced.thingDefs )
+                    {
+                        if( !OriginalData.ThingDef_Recipes.ContainsKey( thingDef ) )
+                        {
+                            // Add ThingDef to dictionary with it's original list of recipes
+                            var recipeDefs = new List<RecipeDef>();
+                            if( !thingDef.recipes.NullOrEmpty() )
+                            {
+                                recipeDefs.AddRange( thingDef.recipes );
+                                foreach( var recipeDef in recipeDefs )
+                                {
+                                    if( !OriginalData.RecipeDef_RecipeUsers.ContainsKey( recipeDef ) )
+                                    {
+                                        // Add RecipeDef to dictionary with it's original list of recipe users
+                                        var recipeUsers = new List<ThingDef>();
+                                        if( !recipeDef.recipeUsers.NullOrEmpty() )
+                                        {
+                                            recipeUsers.AddRange( recipeDef.recipeUsers );
+                                        }
+                                        OriginalData.RecipeDef_RecipeUsers[ recipeDef ] = recipeUsers;
+                                    }
+                                }
+                            }
+                            OriginalData.ThingDef_Recipes[ thingDef ] = recipeDefs;
+                        }
+                    }
+                }
+                if( Advanced.IsBuildingToggle )
+                {   // Handle building research prerequisites
+                    foreach( var thingDef in Advanced.thingDefs )
+                    {
+                        if( !OriginalData.ThingDef_ResearchPrerequisites.ContainsKey( thingDef ) )
+                        {
+                            // Add ThingDef to dictionary with it's original list of prerequisites
+                            var researchDefs = new List<ResearchProjectDef>();
+                            if( !thingDef.researchPrerequisites.NullOrEmpty() )
+                            {
+                                researchDefs.AddRange( thingDef.researchPrerequisites );
+                            }
+                            OriginalData.ThingDef_ResearchPrerequisites[ thingDef ] = researchDefs;
+                        }
+                    }
+                }
+                if( Advanced.IsResearchToggle )
+                {   // Handle research project prerequisites
+                    foreach( var researchDef in Advanced.effectedResearchDefs )
+                    {
+                        if( !OriginalData.ResearchDef_ResearchPrerequisites.ContainsKey( researchDef ) )
+                        {
+                            // Add research to dictionary with it's original list of prerequisites
+                            var researchDefs = new List<ResearchProjectDef>();
+                            if( !researchDef.prerequisites.NullOrEmpty() )
+                            {
+                                researchDefs.AddRange( researchDef.prerequisites );
+                            }
+                            OriginalData.ResearchDef_ResearchPrerequisites[ researchDef ] = researchDefs;
+                        }
+                    }
+                }
+            }
+        }
+
         private void                        SetInitialState( bool firstTimeRun = false )
         {
             // Set the initial state of the advanced research
             PrepareCaches();
 
-            // Process each advanced research def in reverse order
-            for ( int i = Data.AdvancedResearchDefs.Count - 1; i >= 0; i-- )
-            {
-                var Advanced = Data.AdvancedResearchDefs[i];
+            // Reset to the XML data state
+            ResetOriginalData();
 
-                // Reset the project
-                Advanced.Disable( firstTimeRun );
+            // Now update the states for things which will be enabled later
+            foreach( var advanced in Data.AdvancedResearchDefs )
+            {
+                advanced.ResetOnGameLoad();
             }
 
             // Now do the work!
             ProcessCaches( firstTimeRun );
         }
 
+        private void                        ResetOriginalData()
+        {
+            foreach( var pair in OriginalData.RecipeDef_RecipeUsers )
+            {   // Restore RecipeDef.recipeUsers
+                if( pair.Key.recipeUsers == null )
+                {
+                    pair.Key.recipeUsers = new List<ThingDef>();
+                }
+                pair.Key.recipeUsers.Clear();
+                pair.Key.recipeUsers.AddRange( pair.Value );
+                RecacheBuildingRecipes( pair.Key.recipeUsers );
+            }
+
+            foreach( var pair in OriginalData.ThingDef_Recipes )
+            {   // Restore ThingDef.recipes
+                if( pair.Key.recipes == null )
+                {
+                    pair.Key.recipes = new List<RecipeDef>();
+                }
+                pair.Key.recipes.Clear();
+                pair.Key.recipes.AddRange( pair.Value );
+                RecacheBuildingRecipes( pair.Key );
+            }
+
+            foreach( var pair in OriginalData.ThingDef_SowTags )
+            {   // Restore ThingDef.sowTags
+                if( pair.Key.plant.sowTags == null )
+                {
+                    pair.Key.plant.sowTags = new List<string>();
+                }
+                pair.Key.plant.sowTags.Clear();
+                pair.Key.plant.sowTags.AddRange( pair.Value );
+            }
+
+            foreach( var pair in OriginalData.ThingDef_ResearchPrerequisites )
+            {   // Restore ThingDef.researchPrerequisites
+                if( pair.Key.researchPrerequisites == null )
+                {
+                    pair.Key.researchPrerequisites = new List<ResearchProjectDef>();
+                }
+                pair.Key.researchPrerequisites.Clear();
+                pair.Key.researchPrerequisites.AddRange( pair.Value );
+            }
+
+            foreach( var pair in OriginalData.ResearchDef_ResearchPrerequisites )
+            {   // Restore ResearchProjectDef.prerequisites
+                if( pair.Key.prerequisites == null )
+                {
+                    pair.Key.prerequisites = new List<ResearchProjectDef>();
+                }
+                pair.Key.prerequisites.Clear();
+                pair.Key.prerequisites.AddRange( pair.Value );
+            }
+        }
+
         #endregion Research Processing
 
         #region Recache/Process Interface
@@ -285,16 +444,31 @@ public static void                  RecacheBuildingRecipes( ThingDef def )
             buildingCache.AddUnique( def );
         }
 
+        public static void                  RecacheBuildingRecipes( List<ThingDef> defs )
+        {
+            buildingCache.AddRangeUnique( defs );
+        }
+
         public static void                  RecacheHelpCategory( HelpCategoryDef def )
         {
             helpCategoryCache.AddUnique( def );
         }
 
+        public static void                  RecacheHelpCategories( List<HelpCategoryDef> defs )
+        {
+            helpCategoryCache.AddRangeUnique( defs );
+        }
+
         public static void                  ProcessResearchMod( AdvancedResearchMod mod )
         {
             researchModCache.AddUnique( mod );
         }
 
+        public static void                  ProcessResearchMods( List<AdvancedResearchMod> mods )
+        {
+            researchModCache.AddRangeUnique( mods );
+        }
+
         #endregion
 
 	}
diff --git a/DLL_Project/Controller/SubControllers/SubController.cs b/DLL_Project/Controller/SubControllers/SubController.cs
index 60f86da..b359396 100644
--- a/DLL_Project/Controller/SubControllers/SubController.cs
+++ b/DLL_Project/Controller/SubControllers/SubController.cs
@@ -61,13 +61,11 @@ internal                            SubController ()
         public virtual int                  ValidationPriority      => DontProcessThisPhase;
         public virtual int                  InitializationPriority  => DontProcessThisPhase;
         public virtual int                  UpdatePriority          => DontProcessThisPhase;
+        public virtual int                  GameLoadPriority        => DontProcessThisPhase;
 
         // Default update rate is every 30 ticks
         public virtual int                  UpdateTicks             => 30;
 
-        // If the controller Initialize() method should be called on game load return true
-        public virtual bool                 ReinitializeOnGameLoad  => false;
-
         // Entry with controller state Uninitialized
         // Exit with ValidationError (false) on error
         // Validated (true) if ready for initialization
@@ -91,6 +89,39 @@ public virtual bool                 Initialize()
             return true;
         }
 
+        // Entry with controller state Ok or Hybernating, only called during a game load after the small components, 'world' and, 'map' are loaded but before compressed and uncompressed things are loaded
+        // Exit with InitializationError (false) on error
+        // Ok (true) if ready for game play
+        // Hybernating (true) if system is ok and no frame updates are required
+        public virtual bool                 PreThingLoad()
+        {
+            // Default class method for sub-classes which don't require game load events
+            strReturn = string.Empty;
+            return true;
+        }
+
+        // Entry with controller state Ok or Hybernating, only called immediately before a game load or new game
+        // Exit with InitializationError (false) on error
+        // Ok (true) if ready for game play
+        // Hybernating (true) if system is ok and no frame updates are required
+        public virtual bool                 PreLoad()
+        {
+            // Default class method for sub-classes which don't require game load events
+            strReturn = string.Empty;
+            return true;
+        }
+
+        // Entry with controller state Ok or Hybernating, only called immediately after a game load or new game
+        // Exit with InitializationError (false) on error
+        // Ok (true) if ready for game play
+        // Hybernating (true) if system is ok and no frame updates are required
+        public virtual bool                 PostLoad()
+        {
+            // Default class method for sub-classes which don't require game load events
+            strReturn = string.Empty;
+            return true;
+        }
+
         // Entry with controller state Ok
         // Executes every frame during game play
         // Exit with RuntimeError (false) on error
diff --git a/DLL_Project/Controller/SubControllers/SubControllerOrderingReference.txt b/DLL_Project/Controller/SubControllers/SubControllerOrderingReference.txt
index aa02145..dd238d8 100644
--- a/DLL_Project/Controller/SubControllers/SubControllerOrderingReference.txt
+++ b/DLL_Project/Controller/SubControllers/SubControllerOrderingReference.txt
@@ -1,7 +1,7 @@
-SubController:              Validation:     Initialization:     Update:
+SubController:              Validation:     Initialization:     Update:     GameLoad:
 
-HelpSubController           n/a             80                  n/a
-InjectionSubController      90              100                 100
-ModOrderSubController       100             50                  n/a
-MiniMapSubController        10              40                  n/a
-ResearchSubController       50              90                  50
+HelpSubController           n/a             80                  n/a         n/a
+InjectionSubController      90              100                 n/a         100
+ModOrderSubController       100             50                  n/a         n/a
+MiniMapSubController        10              40                  n/a         n/a
+ResearchSubController       50              90                  50          90
diff --git a/DLL_Project/Defs/AdvancedResearchDef.cs b/DLL_Project/Defs/AdvancedResearchDef.cs
index fb9f861..911ae67 100644
--- a/DLL_Project/Defs/AdvancedResearchDef.cs
+++ b/DLL_Project/Defs/AdvancedResearchDef.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
@@ -15,12 +16,15 @@ public class AdvancedResearchDef : Def
 
         #region XML Data
 
+        private const int                   InvalidPriority = 0xBADC0DE;
+        public const int                    HelpConsolidatePriority = -1;
+
         // Processing priority so everything happens in the order it should
         // Lower value is higher priority
-        public int                          Priority;
+        public int                          Priority = InvalidPriority;
 
         // Flag this as true to hide/lock, false (default) for show/unlock
-        public bool                         HideDefs;
+        public bool                         HideDefs = false;
 
         // Research requirement
         public List< ResearchProjectDef >   researchDefs;
@@ -50,7 +54,7 @@ public class AdvancedResearchDef : Def
         HelpDef                             helpDef;
 
         List< AdvancedResearchDef >         matchingAdvancedResearch;
-        AdvancedResearchDef                 researchConsolidator;
+        AdvancedResearchDef                 helpConsolidator;
 
         float                               totalCost = -1;
 
@@ -106,6 +110,9 @@ public bool                         IsValid()
         {
             if( !isValidChecked )
             {
+#if DEVELOPER
+                try{
+#endif
                 // Hopefully...
                 isValid = true;
 
@@ -139,11 +146,129 @@ public bool                         IsValid()
                     );
                 }
 
+                // Validate priority
+                if( Priority < HelpConsolidatePriority )
+                {
+                    isValid = false;
+                    if( Priority == InvalidPriority )
+                    {
+                        // Priority not set (or set to the default invalid value)
+                        CCL_Log.TraceMod(
+                            this,
+                            Verbosity.FatalErrors,
+                            "Priority not set"
+                        );
+                    }
+                    else
+                    {
+                        // Invalid priority
+                        CCL_Log.TraceMod(
+                            this,
+                            Verbosity.FatalErrors,
+                            "Priority must be -1 or greater and unique for matching researchDefs"
+                        );
+                    }
+                }
+                else
+                {
+                    var matchingResearch = this.MatchingAdvancedResearch;
+                    foreach( var otherDef in matchingResearch )
+                    {
+                        if(
+                            ( otherDef != this )&&
+                            ( otherDef.Priority == this.Priority )
+                        )
+                        {
+                            // Invalid priority
+                            isValid = false;
+                            CCL_Log.TraceMod(
+                                this,
+                                Verbosity.FatalErrors,
+                                "Priority must be -1 or greater and unique for matching researchDefs"
+                            );
+                        }
+                    }
+                }
+
+                // Validate help
+                if( researchDefs.Count > 1 )
+                {
+                    if(
+                        (
+                            ( Priority != HelpConsolidatePriority )&&
+                            ( ConsolidateHelp )
+                        )||
+                        (
+                            ( Priority == HelpConsolidatePriority )&&
+                            ( !ConsolidateHelp )
+                        )
+                    )
+                    {
+                        // Not properly setup as the help consolidator
+                        isValid = false;
+                        CCL_Log.TraceMod(
+                            this,
+                            Verbosity.FatalErrors,
+                            string.Format( "Mismatched Priority ({0}) and ConsolidateHelp ({1}) values", Priority, ConsolidateHelp )
+                        );
+                    }
+
+                    // Get the help consolidator
+                    if( HelpConsolidator == null )
+                    {
+                        // Error processing data
+                        isValid = false;
+                        CCL_Log.TraceMod(
+                            this,
+                            Verbosity.FatalErrors,
+                            string.Format( "No valid help consolidator for AdvancedResearchDef {0}", defName )
+                        );
+                    }
+
+                    // Make sure the help consolidator has the proper fields defined
+                    if( HelpConsolidator == this )
+                    {
+                        if( label.NullOrEmpty() )
+                        {
+                            // Error processing data
+                            isValid = false;
+                            CCL_Log.TraceMod(
+                                this,
+                                Verbosity.FatalErrors,
+                                "Help Consolidator requires missing label"
+                            );
+                        }
+                        if( description.NullOrEmpty() )
+                        {
+                            // Error processing data
+                            isValid = false;
+                            CCL_Log.TraceMod(
+                                this,
+                                Verbosity.FatalErrors,
+                                "Help Consolidator requires missing description"
+                            );
+                        }
+                    }
+                }
+                else if(
+                    ( Priority == HelpConsolidatePriority )&&
+                    ( ConsolidateHelp )
+                )
+                {
+                    // Not valid setup as the help consolidator
+                    isValid = false;
+                    CCL_Log.TraceMod(
+                        this,
+                        Verbosity.FatalErrors,
+                        string.Format( "Defs with a single researchDef cannot be help consolidators, Priority = '{0}', ConsolidateHelp = '{1}'", Priority, ConsolidateHelp )
+                    );
+                }
+
                 // Validate recipes
                 if( IsRecipeToggle )
                 {
                     // v0.12.7 - Obsoleted check to allow for automated machines
-                    // Make sure thingDefs are of the appropriate type (has ITab_Bills)
+                    // Make sure thingDefs are of the appropriate type
                     /*
                     foreach( var thingDef in thingDefs )
                     {
@@ -168,10 +293,7 @@ public bool                         IsValid()
                     // Make sure things are of the appropriate class (Plant)
                     foreach( var thingDef in thingDefs )
                     {
-                        if(
-                            ( thingDef.thingClass != typeof( Plant ) )&&
-                            ( !thingDef.thingClass.IsSubclassOf( typeof(Plant) ) )
-                        )
+                        if( !typeof( Plant ).IsAssignableFrom( thingDef.thingClass ) )
                         {
                             // Invalid plant
                             isValid = false;
@@ -251,50 +373,20 @@ public bool                         IsValid()
                     }
                 }
 
-                // Validate help
-                if( researchDefs.Count > 1 )
-                {
-                    if( ResearchConsolidator == null )
-                    {
-                        // Error processing data
-                        isValid = false;
-                        CCL_Log.TraceMod(
-                            this,
-                            Verbosity.FatalErrors,
-                            string.Format( "No valid help consolidator for AdvancedResearchDef {0}", defName )
-                        );
-                    }
-                    if( ( HasHelp )&&
-                        ( ResearchConsolidator == this ) )
-                    {
-                        if( label.NullOrEmpty() )
-                        {
-                            // Error processing data
-                            isValid = false;
-                            CCL_Log.TraceMod(
-                                this,
-                                Verbosity.FatalErrors,
-                                "Help Consolidator requires missing label"
-                            );
-                        }
-                        if( description.NullOrEmpty() )
-                        {
-                            // Error processing data
-                            isValid = false;
-                            CCL_Log.TraceMod(
-                                this,
-                                Verbosity.FatalErrors,
-                                "Help Consolidator requires missing description"
-                            );
-                        }
-                    }
+#endif
+#if DEVELOPER
+                }catch( Exception e ){
+                    CCL_Log.TraceMod(
+                        this,
+                        Verbosity.FatalErrors,
+                        string.Format( "Exception:\n{0}", e ) );
                 }
 #endif
             }
             return isValid;
         }
 
-        public ResearchEnableMode EnableMode
+        public ResearchEnableMode           EnableMode
         {
             get
             {
@@ -321,7 +413,7 @@ public ResearchEnableMode EnableMode
             }
         }
 
-        public bool IsRecipeToggle
+        public bool                         IsRecipeToggle
         {
             get
             {
@@ -334,7 +426,7 @@ public bool IsRecipeToggle
             }
         }
 
-        public bool IsPlantToggle
+        public bool                         IsPlantToggle
         {
             get
             {
@@ -347,7 +439,7 @@ public bool IsPlantToggle
             }
         }
 
-        public bool IsBuildingToggle
+        public bool                         IsBuildingToggle
         {
             get
             {
@@ -360,7 +452,7 @@ public bool IsBuildingToggle
             }
         }
 
-        public bool IsResearchToggle
+        public bool                         IsResearchToggle
         {
             get
             {
@@ -371,7 +463,7 @@ public bool IsResearchToggle
             }
         }
 
-        public bool HasCallbacks
+        public bool                         HasCallbacks
         {
             get
             {
@@ -382,20 +474,20 @@ public bool HasCallbacks
             }
         }
 
-        public bool HasHelp
+        public bool                         HasHelp
         {
             get
             {
                 return
-                    ( ConsolidateHelp )||
                     (
-                        ( ResearchConsolidator != null )&&
-                        ( ResearchConsolidator.ConsolidateHelp )
-                    );
+                        ( ConsolidateHelp )&&
+                        ( Priority == HelpConsolidatePriority )
+                    )||
+                    ( HelpConsolidator != null );
             }
         }
 
-        bool HasMatchingResearch( AdvancedResearchDef other )
+        bool                                HasMatchingResearch( AdvancedResearchDef other )
         {
             if( researchDefs.Count != other.researchDefs.Count )
             {
@@ -407,7 +499,7 @@ bool HasMatchingResearch( AdvancedResearchDef other )
 
             for( int i = 0; i < researchDefs.Count; ++i )
             {
-                if( researchDefs[i] != other.researchDefs[i] )
+                if( researchDefs[ i ] != other.researchDefs[ i ] )
                 {
                     return false;
                 }
@@ -418,7 +510,7 @@ bool HasMatchingResearch( AdvancedResearchDef other )
         /// <summary>
         /// Total research cost of all required researches
         /// </summary>
-        public float TotalCost
+        public float                        TotalCost
         {
             get
             {
@@ -432,26 +524,33 @@ public float TotalCost
 
         
 
-        public AdvancedResearchDef ResearchConsolidator
+        public AdvancedResearchDef          HelpConsolidator
         {
             get
             {
-                if( ConsolidateHelp )
+                if(
+                    ( ConsolidateHelp )&&
+                    ( Priority == HelpConsolidatePriority )
+                )
                 {
                     return this;
                 }
-                if( researchConsolidator == null )
+                if( helpConsolidator == null )
                 {
-                    var matching = Data.AdvancedResearchDefs.Where( a => (
-                        ( HasMatchingResearch( a ) )
-                    ) ).ToList();
-                    researchConsolidator = matching.FirstOrDefault( a => ( a.Priority == -1 )&&( a.ConsolidateHelp ) );
-                    if( researchConsolidator == null )
+                    var matching = MatchingAdvancedResearch;
+                    if(
+                        ( matching.NullOrEmpty() )||
+                        (
+                            ( matching[ 0 ].Priority != HelpConsolidatePriority )||
+                            ( !matching[ 0 ].ConsolidateHelp )
+                        )
+                    )
                     {
-                        researchConsolidator = matching.FirstOrDefault();
+                        return null;
                     }
+                    helpConsolidator = matching[ 0 ];
                 }
-                return researchConsolidator;
+                return helpConsolidator;
             }
         }
 
@@ -459,7 +558,17 @@ public AdvancedResearchDef ResearchConsolidator
 
         #region Process State
 
-        public void Disable( bool firstTimeRun = false )
+        public void                         ResetOnGameLoad()
+        {
+            //CCL_Log.Message( string.Format( "Resetting '{0}', HideDefs = '{1}'", this.defName, this.HideDefs ), "AdvancedResearchDef" );
+            researchState = ResearchEnableMode.Incomplete;
+            if( !HideDefs )
+            {
+                this.Disable( true );
+            }
+        }
+
+        public void                         Disable( bool firstTimeRun = false )
         {
             // Don't disable if it's not the first run and not yet enabled
             if(
@@ -469,7 +578,7 @@ public void Disable( bool firstTimeRun = false )
             {
                 return;
             }
-#if DEBUG
+#if DEVELOPER
             CCL_Log.TraceMod(
                 modHelperDef,
                 Verbosity.StateChanges,
@@ -517,7 +626,7 @@ public void Disable( bool firstTimeRun = false )
             researchState = ResearchEnableMode.Incomplete;
         }
 
-        public void Enable( ResearchEnableMode mode )
+        public void                         Enable( ResearchEnableMode mode )
         {
             // Don't enable if enabled
             if( researchState != ResearchEnableMode.Incomplete )
@@ -536,7 +645,7 @@ public void Enable( ResearchEnableMode mode )
                 }
                 return;
             }
-#if DEBUG
+#if DEVELOPER
             CCL_Log.TraceMod(
                 modHelperDef,
                 Verbosity.StateChanges,
@@ -581,7 +690,7 @@ public void Enable( ResearchEnableMode mode )
             researchState = mode;
         }
 
-        void SortResearch()
+        void                                SortResearch()
         {
             if( researchSorted )
             {
@@ -599,7 +708,7 @@ void SortResearch()
 
         #region Toggle States
 
-        void ToggleRecipes( bool setInitialState = false )
+        void                                ToggleRecipes( bool setInitialState = false )
         {
             bool Hide = !setInitialState ? HideDefs : !HideDefs;
 
@@ -643,7 +752,7 @@ void ToggleRecipes( bool setInitialState = false )
             }
         }
 
-        void TogglePlants( bool setInitialState = false )
+        void                                TogglePlants( bool setInitialState = false )
         {
             bool Hide = !setInitialState ? HideDefs : !HideDefs;
 
@@ -675,7 +784,7 @@ void TogglePlants( bool setInitialState = false )
             }
         }
 
-        void ToggleBuildings( bool setInitialState = false )
+        void                                ToggleBuildings( bool setInitialState = false )
         {
             bool Hide = !setInitialState ? HideDefs : !HideDefs;
 
@@ -686,7 +795,7 @@ void ToggleBuildings( bool setInitialState = false )
             }
         }
 
-        void ToggleResearch( bool setInitialState = false )
+        void                                ToggleResearch( bool setInitialState = false )
         {
             bool Hide = !setInitialState ? HideDefs : !HideDefs;
 
@@ -740,7 +849,7 @@ void ToggleResearch( bool setInitialState = false )
             ResearchProjectDef_Extensions.ClearIsLockedOut();
         }
 
-        void ToggleCallbacks( bool setInitialState = false )
+        void                                ToggleCallbacks( bool setInitialState = false )
         {
             bool Hide = !setInitialState ? HideDefs : !HideDefs;
 
@@ -766,7 +875,7 @@ void ToggleCallbacks( bool setInitialState = false )
             }
         }
 
-        public void ToggleHelp( bool setInitialState = false )
+        public void                         ToggleHelp( bool setInitialState = false )
         {
             if( ( !ConsolidateHelp )||
                 ( HelpDef == null ) )
@@ -794,57 +903,38 @@ public void ToggleHelp( bool setInitialState = false )
 
         #region Aggregate Data
 
-        List<AdvancedResearchDef> MatchingAdvancedResearch
+        List<AdvancedResearchDef>           MatchingAdvancedResearch
         {
             get
             {
-                if( ( matchingAdvancedResearch == null )&&
-                    ( ResearchConsolidator == this ) )
+                if( matchingAdvancedResearch == null )
                 {
                     // Matching advanced research (by requirements)
-                    var matching  = Controller.Data.AdvancedResearchDefs.FindAll( a => (
+                    matchingAdvancedResearch = Controller.Data.AdvancedResearchDefs.FindAll( a => (
                         ( HasMatchingResearch( a ) )
                     ) );
-                    // Find this research as the consolidator
-                    researchConsolidator = matching.First( a => ( a.ConsolidateHelp ) );
-                    if( researchConsolidator == null )
-                    {
-                        // Find the highest priority one instead
-                        researchConsolidator = matching.First();
-                    }
-                    if( researchConsolidator == this )
-                    {
-                        // This is the final consolidator
-                        matching.Remove( this );
-                        // Set reference to help consolidator
-                        foreach( var a in matching )
-                        {
-                            a.researchConsolidator = this;
-                        }
-                        matchingAdvancedResearch = matching;
-                    }
                 }
                 // return the matching research or null
                 return matchingAdvancedResearch;
             }
         }
 
-        public List<Def> GetResearchRequirements()
+        public List<Def>                    GetResearchRequirements()
         {
-            if( ResearchConsolidator != this )
+            if( HelpConsolidator != this )
             {
-                return ResearchConsolidator.GetResearchRequirements();
+                return HelpConsolidator.GetResearchRequirements();
             }
 
             // Return the list of research required
             return researchDefs.ConvertAll<Def>( def => (Def)def );
         }
 
-        public List<ThingDef> GetThingsUnlocked()
+        public List<ThingDef>               GetThingsUnlocked()
         {
-            if( ResearchConsolidator != this )
+            if( HelpConsolidator != this )
             {
-                return ResearchConsolidator.GetThingsUnlocked();
+                return HelpConsolidator.GetThingsUnlocked();
             }
 
             // Buildings it unlocks
@@ -877,11 +967,11 @@ public List<ThingDef> GetThingsUnlocked()
             return thingdefs;
         }
 
-        public List<ThingDef> GetThingsLocked()
+        public List<ThingDef>               GetThingsLocked()
         {
-            if( ResearchConsolidator != this )
+            if( HelpConsolidator != this )
             {
-                return ResearchConsolidator.GetThingsLocked();
+                return HelpConsolidator.GetThingsLocked();
             }
 
             // Buildings it locks
@@ -914,11 +1004,11 @@ public List<ThingDef> GetThingsLocked()
             return thingdefs;
         }
 
-        public List<RecipeDef> GetRecipesUnlocked( ref List<ThingDef> thingdefs )
+        public List<RecipeDef>              GetRecipesUnlocked( ref List<ThingDef> thingdefs )
         {
-            if( ResearchConsolidator != this )
+            if( HelpConsolidator != this )
             {
-                return ResearchConsolidator.GetRecipesUnlocked( ref thingdefs );
+                return HelpConsolidator.GetRecipesUnlocked( ref thingdefs );
             }
 
             // Recipes on buildings it unlocks
@@ -963,11 +1053,11 @@ public List<RecipeDef> GetRecipesUnlocked( ref List<ThingDef> thingdefs )
             return recipedefs;
         }
 
-        public List<RecipeDef> GetRecipesLocked( ref List<ThingDef> thingdefs )
+        public List<RecipeDef>              GetRecipesLocked( ref List<ThingDef> thingdefs )
         {
-            if( ResearchConsolidator != this )
+            if( HelpConsolidator != this )
             {
-                return ResearchConsolidator.GetRecipesLocked( ref thingdefs );
+                return HelpConsolidator.GetRecipesLocked( ref thingdefs );
             }
 
             // Recipes on buildings it locks
@@ -1009,11 +1099,11 @@ public List<RecipeDef> GetRecipesLocked( ref List<ThingDef> thingdefs )
             return recipedefs;
         }
 
-        public List<string> GetSowTagsUnlocked( ref List<ThingDef> thingdefs )
+        public List<string>                 GetSowTagsUnlocked( ref List<ThingDef> thingdefs )
         {
-            if( ResearchConsolidator != this )
+            if( HelpConsolidator != this )
             {
-                return ResearchConsolidator.GetSowTagsUnlocked( ref thingdefs );
+                return HelpConsolidator.GetSowTagsUnlocked( ref thingdefs );
             }
 
             // Sow tags on plants it unlocks
@@ -1058,11 +1148,11 @@ public List<string> GetSowTagsUnlocked( ref List<ThingDef> thingdefs )
             return sowtags;
         }
 
-        public List<string> GetSowTagsLocked( ref List<ThingDef> thingdefs )
+        public List<string>                 GetSowTagsLocked( ref List<ThingDef> thingdefs )
         {
-            if( ResearchConsolidator != this )
+            if( HelpConsolidator != this )
             {
-                return ResearchConsolidator.GetSowTagsLocked( ref thingdefs );
+                return HelpConsolidator.GetSowTagsLocked( ref thingdefs );
             }
 
             // Sow tags on plants it unlocks
@@ -1107,11 +1197,11 @@ public List<string> GetSowTagsLocked( ref List<ThingDef> thingdefs )
             return sowtags;
         }
 
-        public List<Def> GetResearchUnlocked()
+        public List<Def>                    GetResearchUnlocked()
         {
-            if( ResearchConsolidator != this )
+            if( HelpConsolidator != this )
             {
-                return ResearchConsolidator.GetResearchUnlocked();
+                return HelpConsolidator.GetResearchUnlocked();
             }
 
             // Research it unlocks
@@ -1144,11 +1234,11 @@ public List<Def> GetResearchUnlocked()
             return researchdefs;
         }
 
-        public List<Def> GetResearchLocked()
+        public List<Def>                    GetResearchLocked()
         {
-            if( ResearchConsolidator != this )
+            if( HelpConsolidator != this )
             {
-                return ResearchConsolidator.GetResearchLocked();
+                return HelpConsolidator.GetResearchLocked();
             }
 
             // Research it locks
@@ -1185,7 +1275,7 @@ public List<Def> GetResearchLocked()
 
         #region Help Def
 
-        public HelpDef HelpDef
+        public HelpDef                      HelpDef
         {
             get
             {
@@ -1194,9 +1284,9 @@ public HelpDef HelpDef
                     return helpDef;
                 }
 
-                if( ResearchConsolidator != null )
+                if( HelpConsolidator != null )
                 {
-                    return ResearchConsolidator.helpDef;
+                    return HelpConsolidator.helpDef;
                 }
                 return null;
             }
@@ -1213,7 +1303,7 @@ public HelpDef HelpDef
 
         #region ResearchProjectDef 'interface'
 
-        public bool IsFinished
+        public bool                         IsFinished
         {
             get
             {
diff --git a/DLL_Project/Detours/AddictionUtility.cs b/DLL_Project/Detours/AddictionUtility.cs
index 2f8f911..4583683 100644
--- a/DLL_Project/Detours/AddictionUtility.cs
+++ b/DLL_Project/Detours/AddictionUtility.cs
@@ -9,7 +9,7 @@
 namespace CommunityCoreLibrary.Detour
 {
     
-    internal class _AddictionUtility
+    internal static class _AddictionUtility
     {
 
         #region Helper Methods
diff --git a/DLL_Project/Detours/FoodUtility.cs b/DLL_Project/Detours/FoodUtility.cs
index 162ad97..5d87d4e 100644
--- a/DLL_Project/Detours/FoodUtility.cs
+++ b/DLL_Project/Detours/FoodUtility.cs
@@ -1,4 +1,9 @@
-using System;
+// Enable this define to do a whole bunch of debug logging
+#if DEVELOPER
+//#define _I_AM_A_POTATO_
+#endif
+
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 
@@ -66,7 +71,7 @@ internal static Thing               SpawnedFoodSearchInnerScan( Pawn eater, IntV
 
         #endregion
 
-#if DEVELOPER
+#if _I_AM_A_POTATO_
         internal static void                DumpThingsRequestedForGroup( ThingRequest thingRequest, List<Thing> thingsRequested )
         {
             var str = string.Format( "ListerThings.ThingsMatching( {0} ) ::\n", thingRequest );
@@ -82,12 +87,16 @@ internal static void                DumpThingsRequestedForGroup( ThingRequest th
         [DetourMember( typeof( FoodUtility ) )]
         internal static ThingDef            _GetFinalIngestibleDef( Thing foodSource )
         {
-            //CCL_Log.Message( string.Format( "GetFinalIngestibleDef( {0} )", foodSource.ThingID ) );
+#if _I_AM_A_POTATO_
+            CCL_Log.Message( string.Format( "GetFinalIngestibleDef( {0} )", foodSource.ThingID ) );
+#endif
 
             var nutrientPasteDispenser = foodSource as Building_NutrientPasteDispenser;
             if( nutrientPasteDispenser != null )
             {
-                //CCL_Log.Message( string.Format( "GetFinalIngestibleDef( {0} ) - {1}", foodSource.ThingID, nutrientPasteDispenser.DispensableDef.defName ) );
+#if _I_AM_A_POTATO_
+                CCL_Log.Message( string.Format( "GetFinalIngestibleDef( {0} ) - {1}", foodSource.ThingID, nutrientPasteDispenser.DispensableDef.defName ) );
+#endif
                 return nutrientPasteDispenser.DispensableDef;
             }
 
@@ -95,7 +104,7 @@ internal static ThingDef            _GetFinalIngestibleDef( Thing foodSource )
             if( synthesizer != null )
             {
                 var synthesizedDef = synthesizer.ConsideredProduct;
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                 if( synthesizedDef == null )
                 {
                     CCL_Log.Trace(
@@ -104,6 +113,7 @@ internal static ThingDef            _GetFinalIngestibleDef( Thing foodSource )
                         "Detour.FoodUtility.GetFinalIngestibleDef"
                     );
                 }
+                CCL_Log.Message( string.Format( "GetFinalIngestibleDef( {0} ) - {1}", foodSource.ThingID, synthesizedDef.defName ) );
 #endif
                 return synthesizedDef;
             }
@@ -111,10 +121,14 @@ internal static ThingDef            _GetFinalIngestibleDef( Thing foodSource )
             var prey = foodSource as Pawn;
             if( prey != null )
             {
-                //CCL_Log.Message( string.Format( "GetFoodDef( {0} ) - {1}", foodSource.ThingID, prey.RaceProps.corpseDef.defName ) );
+#if _I_AM_A_POTATO_
+                CCL_Log.Message( string.Format( "GetFoodDef( {0} ) - {1}", foodSource.ThingID, prey.RaceProps.corpseDef.defName ) );
+#endif
                 return prey.RaceProps.corpseDef;
             }
-            //CCL_Log.Message( string.Format( "GetFoodDef( {0} ) - {1}", foodSource.ThingID, foodSource.def.defName ) );
+#if _I_AM_A_POTATO_
+            CCL_Log.Message( string.Format( "GetFoodDef( {0} ) - {1}", foodSource.ThingID, foodSource.def.defName ) );
+#endif
             return foodSource.def;
         }
 
@@ -133,7 +147,7 @@ internal static float               _FoodSourceOptimality( Pawn eater, Thing t,
                 }
                 else if( synthesizer.IsReserved )
                 {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                     CCL_Log.Message(
                         string.Format( "{0} cannot be used by {1} as it has been reserved by {2}", t.ThingID, eater.LabelShort, synthesizer.ConsideredPawn.LabelShort ),
                         "Detour.FoodUtility.FoodSourceOptimality"
@@ -146,7 +160,7 @@ internal static float               _FoodSourceOptimality( Pawn eater, Thing t,
                     mealDef = synthesizer.BestProduct( FoodSynthesis.IsMeal, FoodSynthesis.SortMeal );
                     if( mealDef == null )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} does not have enough resources to produce anything for {1}", t.ThingID, eater.LabelShort ),
                             "Detour.FoodUtility.FoodSourceOptimality"
@@ -156,7 +170,7 @@ internal static float               _FoodSourceOptimality( Pawn eater, Thing t,
                     }
                     if( !synthesizer.ConsiderFor( mealDef, eater ) )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Trace(
                             Verbosity.NonFatalErrors,
                             string.Format( "{0} cannot be considered by {1} for {2}", t.ThingID, eater.LabelShort, mealDef.defName ),
@@ -168,7 +182,7 @@ internal static float               _FoodSourceOptimality( Pawn eater, Thing t,
                 }
                 if( mealDef == null )
                 {   // This should never happen, why is it?
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                     CCL_Log.Trace(
                         Verbosity.NonFatalErrors,
                         string.Format( "{0} has not or cannot been considered by {1}", t.ThingID, eater.LabelShort ),
@@ -182,7 +196,9 @@ internal static float               _FoodSourceOptimality( Pawn eater, Thing t,
             {
                 mealDef = ((Building_NutrientPasteDispenser)t).DispensableDef;
             }
-            //CCL_Log.Message( string.Format( "FoodSourceOptimality for {0} eating {1} from {2}", eater.LabelShort, def.defName, t.ThingID ) );
+#if _I_AM_A_POTATO_
+            CCL_Log.Message( string.Format( "FoodSourceOptimality for {0} eating {1} from {2}", eater.LabelShort, def.defName, t.ThingID ) );
+#endif
             switch( mealDef.ingestible.preferability )
             {
             case FoodPreferability.NeverForNutrition:
@@ -206,7 +222,9 @@ internal static float               _FoodSourceOptimality( Pawn eater, Thing t,
                     num += 12f;
                 }
             }
-            //CCL_Log.Message( string.Format( "FoodSourceOptimality for {0} eating {1} from {2} = {3}", eater.LabelShort, def.defName, t.ThingID, num ) );
+#if _I_AM_A_POTATO_
+            CCL_Log.Message( string.Format( "FoodSourceOptimality for {0} eating {1} from {2} = {3}", eater.LabelShort, def.defName, t.ThingID, num ) );
+#endif
             if(
                 ( eater.needs != null )&&
                 ( eater.needs.mood != null )
@@ -244,12 +262,6 @@ internal static List<ThoughtDef>    _ThoughtsFromIngesting( Pawn ingester, Thing
             if( t is Building_AutomatedFactory )
             {
                 mealDef = ((Building_AutomatedFactory)t).ConsideredProduct;
-                /*
-                if( mealDef == null )
-                {
-                    mealDef = ((Building_AutomatedFactory)t).BestProduct( FoodSynthesis.IsMeal, FoodSynthesis.SortMeal );
-                }
-                */
             }
             else if( t is Building_NutrientPasteDispenser )
             {
@@ -325,7 +337,7 @@ internal static List<ThoughtDef>    _ThoughtsFromIngesting( Pawn ingester, Thing
         [DetourMember( typeof( FoodUtility ) )]
         internal static Thing               _BestFoodSourceOnMap( Pawn getter, Pawn eater, bool desperate, FoodPreferability maxPref = FoodPreferability.MealLavish, bool allowPlant = true, bool allowDrug = true, bool allowCorpse = true, bool allowDispenserFull = true, bool allowDispenserEmpty = true, bool allowForbidden = false )
         {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
             CCL_Log.Message(
                 string.Format( "{0} fetching for {1} ", getter.LabelShort, eater.LabelShort ),
                 "Detour.FoodUtility.BestFoodSourceOnMap"
@@ -340,7 +352,7 @@ internal static Thing               _BestFoodSourceOnMap( Pawn getter, Pawn eate
                 ( getter != eater )
             )
             {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                 CCL_Log.Trace(
                     Verbosity.NonFatalErrors,
                     string.Format( "{0} tried to find food to bring to {1} but {0} is incapable of Manipulation.", getter.LabelShort, eater.LabelShort ),
@@ -386,7 +398,7 @@ internal static Thing               _BestFoodSourceOnMap( Pawn getter, Pawn eate
             {
                 var thingsRequested = Find.ListerThings.ThingsMatching( thingRequest );
 
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                 DumpThingsRequestedForGroup( thingRequest, thingsRequested );
 
 
@@ -410,7 +422,7 @@ internal static Thing               _BestFoodSourceOnMap( Pawn getter, Pawn eate
             }
             else
             {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                 CCL_Log.Message(
                     "Non-humanlike closest reachable...",
                     "Detour.FoodUtility.BestFoodSourceOnMap"
@@ -437,7 +449,7 @@ internal static Thing               _BestFoodSourceOnMap( Pawn getter, Pawn eate
                     false );
                 if( potentialFoodSource == null )
                 {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                     CCL_Log.Message(
                         "Non-humanlike closest reachable desperate...",
                         "Detour.FoodUtility.BestFoodSourceOnMap"
@@ -466,7 +478,7 @@ internal static Thing               _BestFoodSourceOnMap( Pawn getter, Pawn eate
             {
                 mealDef = synthesizer.ConsideredProduct;
             }
-#if DEVELOPER
+#if _I_AM_A_POTATO_
             CCL_Log.Message(
                 string.Format(
                     "{0} picked {1} ({3}) for {2}",
@@ -509,7 +521,7 @@ internal bool ValidateFast( Thing t )
                     ( t.IsForbidden( getter ) )
                 )
                 {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                     CCL_Log.Message(
                         string.Format( "{0} cannot use {1} because it is forbidden", getter.LabelShort, t.ThingID ),
                         "Detour.FoodUtility.DispenserValidator"
@@ -523,7 +535,7 @@ internal bool ValidateFast( Thing t )
                     ( t.Faction != getter.HostFaction )
                 )
                 {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                     CCL_Log.Message(
                         string.Format( "{0} cannot use {1} because it is the wrong faction - Faction for {1} is {2} - Faction for {0} is {3}, host is {4}", getter.LabelShort, t.ThingID, t.Faction?.Name, getter.Faction?.Name, getter.HostFaction?.Name ),
                         "Detour.FoodUtility.DispenserValidator"
@@ -533,7 +545,7 @@ internal bool ValidateFast( Thing t )
                 }
                 if( !t.IsSociallyProper( getter ) )
                 {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                     CCL_Log.Message(
                         string.Format( "{0} cannot use {1} because it is socially improper", getter.LabelShort, t.ThingID ),
                         "Detour.FoodUtility.DispenserValidator"
@@ -547,7 +559,7 @@ internal bool ValidateFast( Thing t )
                     // Common checks for all machines
                     if( !allowDispenserFull )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because cannot use full dispensers", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -557,7 +569,7 @@ internal bool ValidateFast( Thing t )
                     }
                     if( !getterCanManipulate )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because {0} cannot manipulate", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -571,7 +583,7 @@ internal bool ValidateFast( Thing t )
                         ( !compPower.PowerOn )
                     )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because it is unpowered", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -581,7 +593,7 @@ internal bool ValidateFast( Thing t )
                     }
                     if( !t.InteractionCell.Standable() )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because the interaction cell is unstandable", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -600,7 +612,7 @@ internal bool ValidateFast( Thing t )
                             false )
                     ) )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because it is unreachable", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -610,7 +622,7 @@ internal bool ValidateFast( Thing t )
                     }
                     if( !getter.CanReserve( t, 1 ) )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because it is unreservable", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -627,7 +639,7 @@ internal bool ValidateFast( Thing t )
                             ( NPD.DispensableDef.ingestible.preferability > maxPref )
                         )
                         {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                             CCL_Log.Message(
                                 string.Format( "{0} cannot use {1} because it is not preferable", getter.LabelShort, t.ThingID ),
                                 "Detour.FoodUtility.DispenserValidator"
@@ -640,7 +652,7 @@ internal bool ValidateFast( Thing t )
                             ( !NPD.HasEnoughFeedstockInHoppers() )
                         )
                         {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                             CCL_Log.Message(
                                 string.Format( "{0} cannot use {1} because it is empty", getter.LabelShort, t.ThingID ),
                                 "Detour.FoodUtility.DispenserValidator"
@@ -655,7 +667,7 @@ internal bool ValidateFast( Thing t )
                     {
                         if( synthesizer.IsReserved )
                         {   // Already in use
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                             CCL_Log.Message(
                                 string.Format( "{0} cannot use {1} because it has been reserved by {2}", getter.LabelShort, t.ThingID, synthesizer.ConsideredPawn.LabelShort ),
                                 "Detour.FoodUtility.DispenserValidator"
@@ -663,7 +675,7 @@ internal bool ValidateFast( Thing t )
 #endif
                             return false;
                         }
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} might use {1}", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -672,7 +684,7 @@ internal bool ValidateFast( Thing t )
                         var mealDef = synthesizer.BestProduct( FoodSynthesis.IsMeal, FoodSynthesis.SortMeal );
                         if( mealDef == null )
                         {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                             CCL_Log.Message(
                                 string.Format( "{0} cannot use {1} because it is empty", getter.LabelShort, t.ThingID ),
                                 "Detour.FoodUtility.DispenserValidator"
@@ -685,7 +697,7 @@ internal bool ValidateFast( Thing t )
                             ( mealDef.ingestible.preferability > maxPref )
                         )
                         {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                             CCL_Log.Message(
                                 string.Format( "{0} cannot use {1} for {2} because it is not preferable", getter.LabelShort, t.ThingID, mealDef.defName ),
                                 "Detour.FoodUtility.DispenserValidator"
@@ -695,7 +707,7 @@ internal bool ValidateFast( Thing t )
                         }
                         if( !synthesizer.ConsiderFor( mealDef, getter ) )
                         {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                             CCL_Log.Message(
                                 string.Format( "{0} cannot consider {1} for {2}", getter.LabelShort, t.ThingID, mealDef.defName ),
                                 "Detour.FoodUtility.DispenserValidator"
@@ -703,7 +715,7 @@ internal bool ValidateFast( Thing t )
 #endif
                             return false;
                         }
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} considered {1} for {2}", getter.LabelShort, t.ThingID, mealDef.defName ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -719,7 +731,7 @@ internal bool ValidateFast( Thing t )
                         ( t.def.ingestible.preferability > maxPref )
                     )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because it is not preferable", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -729,7 +741,7 @@ internal bool ValidateFast( Thing t )
                     }
                     if( !t.IngestibleNow )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because it is not ingestible now", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -742,7 +754,7 @@ internal bool ValidateFast( Thing t )
                         ( t is Corpse )
                     )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because it is a corpse", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -755,7 +767,7 @@ internal bool ValidateFast( Thing t )
                         ( t.def.IsDrug )
                     )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because it is liquor", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -771,7 +783,7 @@ internal bool ValidateFast( Thing t )
                         )
                     )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because it is not fresh or it's dessicated", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -781,7 +793,7 @@ internal bool ValidateFast( Thing t )
                     }
                     if( !eater.RaceProps.WillAutomaticallyEat( t ) )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because it will not automatically eat it", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -791,7 +803,7 @@ internal bool ValidateFast( Thing t )
                     }
                     if( !getter.AnimalAwareOf( t ) )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because it is not aware of it", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -801,7 +813,7 @@ internal bool ValidateFast( Thing t )
                     }
                     if( !getter.CanReserve( t, 1 ) )
                     {
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                         CCL_Log.Message(
                             string.Format( "{0} cannot use {1} because it cannot reserve it", getter.LabelShort, t.ThingID ),
                             "Detour.FoodUtility.DispenserValidator"
@@ -810,7 +822,7 @@ internal bool ValidateFast( Thing t )
                         return false;
                     }
                 }
-#if DEVELOPER
+#if _I_AM_A_POTATO_
                 CCL_Log.Message(
                     string.Format( "{0} can use {1}", getter.LabelShort, t.ThingID ),
                     "Detour.FoodUtility.DispenserValidator"
diff --git a/DLL_Project/Detours/Game.cs b/DLL_Project/Detours/Game.cs
new file mode 100644
index 0000000..037d424
--- /dev/null
+++ b/DLL_Project/Detours/Game.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Linq;
+
+using RimWorld;
+using RimWorld.Planet;
+using Verse;
+
+namespace CommunityCoreLibrary.Detour
+{
+    
+    internal class _Game : Game
+    {
+
+        internal static MethodInfo          _ExposeSmallComponents;
+        internal static FieldInfo           _mapInt;
+
+        static                              _Game()
+        {
+            _ExposeSmallComponents = typeof( Game ).GetMethod( "ExposeSmallComponents", Controller.Data.UniversalBindingFlags );
+            if( _ExposeSmallComponents == null )
+            {
+                CCL_Log.Trace(
+                    Verbosity.FatalErrors,
+                    "Unable to get method 'ExposeSmallComponents' in 'Game'",
+                    "Detour.Game" );
+            }
+            _mapInt = typeof( Game ).GetField( "mapInt", Controller.Data.UniversalBindingFlags );
+            if( _mapInt == null )
+            {
+                CCL_Log.Trace(
+                    Verbosity.FatalErrors,
+                    "Unable to get method 'mapInt' in 'Game'",
+                    "Detour.Game" );
+            }
+        }
+
+        #region Reflected Methods
+
+        internal void                       ExposeSmallComponents()
+        {
+            _ExposeSmallComponents.Invoke( this, null );
+        }
+
+        internal Map                        mapInt
+        {
+            get
+            {
+                return (Map)_mapInt.GetValue( this );
+            }
+            set
+            {
+                _mapInt.SetValue( this, value );
+            }
+        }
+
+        #endregion
+
+        #region Detoured Methods
+
+        [DetourMember]
+        internal void                       _LoadData()
+        {
+            ExposeSmallComponents();
+
+            LongEventHandler.SetCurrentEventText( "LoadingWorld".Translate() );
+            Scribe.EnterNode( "world" );
+            {
+                Current.Game.World = new World();
+                Find.World.ExposeData();
+            }
+            Scribe.ExitNode();
+
+            LongEventHandler.SetCurrentEventText( "LoadingMap".Translate() );
+            mapInt = new Map();
+
+            List<Thing> nonCompressedThings = null;
+            MapFileCompressor mapFileCompressor = null;
+            Scribe.EnterNode( "map" );
+            {
+                Scribe_Deep.LookDeep<MapInfo>( ref Find.Map.info, "mapInfo", new object[ 0 ] );
+
+                MapIniterUtility.ReinitStaticMapComponents_PreConstruct();
+                Find.Map.ConstructComponents();
+                MapIniterUtility.ReinitStaticMapComponents_PostConstruct();
+                Find.Map.ExposeComponents();
+
+                // Now call the subcontrollers that needs to do stuff between the basic game data loaded but before things are loaded
+                Controller.SubControllers.PreThingLoad();
+
+                DeepProfiler.Start( "Load compressed things" );
+                mapFileCompressor = new MapFileCompressor();
+                mapFileCompressor.ExposeData();
+                DeepProfiler.End();
+
+                DeepProfiler.Start( "Load non-compressed things" );
+                Scribe_Collections.LookList<Thing>( ref nonCompressedThings, "things", LookMode.Deep, new object[ 0 ] );
+                DeepProfiler.End();
+            }
+            Scribe.ExitNode();
+
+            Scribe.FinalizeLoading();
+
+            LongEventHandler.SetCurrentEventText( "InitializingMap".Translate() );
+
+            DeepProfiler.Start( "ResolveAllCrossReferences" );
+            CrossRefResolver.ResolveAllCrossReferences();
+            DeepProfiler.End();
+
+            DeepProfiler.Start( "DoAllPostLoadInits" );
+            PostLoadInitter.DoAllPostLoadInits();
+            DeepProfiler.End();
+
+            LongEventHandler.SetCurrentEventText( "SpawningAllThings".Translate() );
+
+            var thingsToSpawnAfterLoad = mapFileCompressor.ThingsToSpawnAfterLoad().ToList<Thing>();
+
+            DeepProfiler.Start( "Merge compressed and non-compressed thing lists" );
+            var allThings = new List<Thing>( nonCompressedThings.Count + thingsToSpawnAfterLoad.Count );
+            foreach( var thing in nonCompressedThings.Concat( thingsToSpawnAfterLoad ) )
+            {
+                allThings.Add( thing );
+            }
+            DeepProfiler.End();
+            DeepProfiler.Start( "Spawn everything into the map" );
+
+            foreach( var thing in allThings )
+            {
+                try
+                {
+                    GenSpawn.Spawn( thing, thing.Position, thing.Rotation );
+                }
+                catch( Exception ex )
+                {
+                    Log.Error( string.Format( "Exception spawning loaded thing {0}: {1}", thing, ex ) );
+                }
+            }
+            DeepProfiler.End();
+            MapIniterUtility.FinalizeMapInit();
+
+            // Finally, call the subcontrollers that need to do stuff after a game load
+            Controller.SubControllers.PostLoad();
+        }
+
+        #endregion
+
+    }
+
+}
diff --git a/DLL_Project/Detours/PlayDataLoader.cs b/DLL_Project/Detours/PlayDataLoader.cs
index 767fb4c..da28db1 100644
--- a/DLL_Project/Detours/PlayDataLoader.cs
+++ b/DLL_Project/Detours/PlayDataLoader.cs
@@ -28,7 +28,7 @@ static                              _PlayDataLoader()
                 CCL_Log.Trace(
                     Verbosity.FatalErrors,
                     "Unable to get field 'loadedInt' in 'PlayDataLoader'",
-                    "Detour.PlatDataLoader" );
+                    "Detour.PlayDataLoader" );
             }
             _DoPlayLoad = typeof( Verse.PlayDataLoader ).GetMethod( "DoPlayLoad", Controller.Data.UniversalBindingFlags );
             if( _DoPlayLoad == null )
@@ -36,7 +36,7 @@ static                              _PlayDataLoader()
                 CCL_Log.Trace(
                     Verbosity.FatalErrors,
                     "Unable to get method 'DoPlayLoad' in 'PlayDataLoader'",
-                    "Detour.PlatDataLoader" );
+                    "Detour.PlayDataLoader" );
             }
         }
 
diff --git a/DLL_Project/Detours/PreLoadUtility.cs b/DLL_Project/Detours/PreLoadUtility.cs
deleted file mode 100644
index bd72579..0000000
--- a/DLL_Project/Detours/PreLoadUtility.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-
-using Verse;
-
-namespace CommunityCoreLibrary.Detour
-{
-    
-    internal static class _PreLoadUtility
-    {
-
-        [DetourMember( typeof( PreLoadUtility ) )]
-        internal static void                _CheckVersionAndLoad( string path, ScribeMetaHeaderUtility.ScribeHeaderMode mode, Action loadAct )
-        {
-            bool mismatchWarnings;
-            try
-            {
-                try
-                {
-                    Scribe.InitLoadingMetaHeaderOnly( path );
-                }
-                catch (Exception ex)
-                {
-                    Log.Warning(string.Concat(new object[4]
-                    {
-                        (object) "Exception loading ",
-                        (object) path,
-                        (object) ": ",
-                        (object) ex
-                    }));
-                }
-                // Reset injection sub-controller updates on new/load game
-                Controller.Data.ResetInjectionSubController();
-                ScribeMetaHeaderUtility.LoadGameDataHeader( mode, false );
-                mismatchWarnings = ScribeMetaHeaderUtility.TryCreateDialogsForVersionMismatchWarnings( loadAct );
-                CrossRefResolver.ResolveAllCrossReferences();
-                PostLoadInitter.DoAllPostLoadInits();
-            }
-            catch
-            {
-                CrossRefResolver.Clear();
-                PostLoadInitter.Clear();
-                throw;
-            }
-            if( mismatchWarnings )
-            {
-                return;
-            }
-            loadAct();
-        }
-
-    }
-
-}
diff --git a/DLL_Project/Detours/RootMap.cs b/DLL_Project/Detours/RootMap.cs
new file mode 100644
index 0000000..1312e35
--- /dev/null
+++ b/DLL_Project/Detours/RootMap.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Reflection;
+
+using UnityEngine;
+using Verse;
+
+namespace CommunityCoreLibrary.Detour
+{
+    
+    internal class _RootMap : Verse.Root
+    {
+
+        internal static MethodInfo          _ErrorWhileLoadingMap;
+        internal static MethodInfo          _ErrorWhileGeneratingMap;
+
+        static                              _RootMap()
+        {
+            _ErrorWhileLoadingMap = typeof( RootMap ).GetMethod( "ErrorWhileLoadingMap", Controller.Data.UniversalBindingFlags );
+            if( _ErrorWhileLoadingMap == null )
+            {
+                CCL_Log.Trace(
+                    Verbosity.FatalErrors,
+                    "Unable to get field 'ErrorWhileLoadingMap' in 'RootMap'",
+                    "Detour.RootMap" );
+            }
+            _ErrorWhileGeneratingMap = typeof( RootMap ).GetMethod( "ErrorWhileGeneratingMap", Controller.Data.UniversalBindingFlags );
+            if( _ErrorWhileGeneratingMap == null )
+            {
+                CCL_Log.Trace(
+                    Verbosity.FatalErrors,
+                    "Unable to get field 'ErrorWhileGeneratingMap' in 'RootMap'",
+                    "Detour.RootMap" );
+            }
+        }
+
+        internal void                       ErrorWhileLoadingMap( Exception e )
+        {
+            _ErrorWhileLoadingMap.Invoke( this, new[] { e } );
+        }
+
+        internal void                       ErrorWhileGeneratingMap( Exception e )
+        {
+            _ErrorWhileGeneratingMap.Invoke( this, new[] { e } );
+        }
+
+        [DetourMember( typeof( RootMap ) )]
+        internal void                       _Start()
+        {
+            // Do subcontroller preload
+            Controller.SubControllers.PreLoad();
+            // Root.Start()
+            base.Start();
+            // RootMap.Start()
+            if(
+                ( Find.GameInitData != null )&&
+                ( !Find.GameInitData.mapToLoad.NullOrEmpty() )
+            )
+            {
+                LongEventHandler.QueueLongEvent(
+                    () =>
+                {
+                    SavedGameLoader.LoadGameFromSaveFile( Find.GameInitData.mapToLoad );
+                },
+                    "LoadingLongEvent",
+                    true,
+                    ErrorWhileLoadingMap
+                );
+            }
+            else
+            {
+                LongEventHandler.QueueLongEvent(
+                    MapIniter_NewGame.InitNewGeneratedMap,
+                    "GeneratingMap",
+                    true,
+                    ErrorWhileGeneratingMap
+                );
+            }
+            LongEventHandler.QueueLongEvent(
+                () =>
+            {
+                ScreenFader.SetColor( Color.black );
+                ScreenFader.StartFade( Color.clear, 0.5f );
+            },
+                null,
+                false,
+                null
+            );
+        }
+
+    }
+
+}
diff --git a/DLL_Project/Detours/ThingListGroupHelper.cs b/DLL_Project/Detours/ThingListGroupHelper.cs
index e46e483..ec985ad 100644
--- a/DLL_Project/Detours/ThingListGroupHelper.cs
+++ b/DLL_Project/Detours/ThingListGroupHelper.cs
@@ -1,19 +1,54 @@
-using System;
+#if DEVELOPER
+// Enable this define for a whole bunch of debug logging
+//#define _I_AM_A_POTATO_
+// Enable this define to target only a specific def, see MonitorForDef below
+#define _I_AM_WATCHING_YOU_
+#endif
+
+using System;
 using System.Collections.Generic;
 
 using RimWorld;
 using Verse;
 using Verse.AI;
 
+using CommunityCoreLibrary;
+
 namespace CommunityCoreLibrary.Detour
 {
     
     internal static class _ThingListGroupHelper
     {
 
+#if _I_AM_A_POTATO_
+#if _I_AM_WATCHING_YOU_
+        private const string                MonitorForDef = "Synthesizer";
+#endif
+#endif
+
         [DetourMember( typeof( ThingListGroupHelper ) )]
         internal static bool                _Includes( this ThingRequestGroup group, ThingDef def )
         {
+#if _I_AM_A_POTATO_
+            var rVal = _IncludesInt( group, def );
+#if _I_AM_WATCHING_YOU_
+            if( def.defName == MonitorForDef )
+            {
+#endif
+                CCL_Log.Trace(
+                    Verbosity.Default,
+                    string.Format( "Group '{0}' includes Def '{1}' = '{2}'", group, def.defName, rVal ),
+                    "Detour.ThingListGroupHelper.Includes"
+                );
+#if _I_AM_WATCHING_YOU_
+            }
+#endif
+            return rVal;
+        }
+
+        internal static bool                _IncludesInt( ThingRequestGroup group, ThingDef def )
+        {
+#endif
             switch( group )
             {
             case ThingRequestGroup.Undefined:
@@ -121,8 +156,11 @@ internal static bool                _Includes( this ThingRequestGroup group, Thi
                 
             case ThingRequestGroup.Drug:
                 // Catch Automated Factories that can be drug synthesizers
-                if( def.IsFoodDispenser )
-                {
+                if(
+                    ( typeof( Building_AutomatedFactory ).IsAssignableFrom( def.thingClass ) )&&
+                    ( Building_AutomatedFactory.DefOutputToPawnsDirectly( def ) )
+                )
+                {   // Since nutrient paste dispensers are also food dispensers, we need to check this way instead of IsFoodDispenser
                     var products = def.AllRecipes;
                     if( products.NullOrEmpty() )
                     {
@@ -170,9 +208,9 @@ internal static bool                _Includes( this ThingRequestGroup group, Thi
                     return typeof( DropPodIncoming ).IsAssignableFrom( def.thingClass );
                 }
                 return true;
-                
+
             default:
-                throw new ArgumentException("group");
+                throw new ArgumentException( "group" );
             }
         }
 
diff --git a/DLL_Project/Extensions/ListerThings_Extensions.cs b/DLL_Project/Extensions/ListerThings_Extensions.cs
index 8bc5bbb..27496c4 100644
--- a/DLL_Project/Extensions/ListerThings_Extensions.cs
+++ b/DLL_Project/Extensions/ListerThings_Extensions.cs
@@ -12,6 +12,7 @@ public static class ListerThings_Extensions
     {
 
         private static FieldInfo            _listsByGroup;
+        private static FieldInfo            _listsByDef;
 
         static                              ListerThings_Extensions()
         {
@@ -23,12 +24,24 @@ static                              ListerThings_Extensions()
                     "Unable to get field 'listsByGroup' in 'ListerThings'",
                     "ListerThings_Extensions" );
             }
+            _listsByDef = typeof( ListerThings ).GetField( "listsByDef", Controller.Data.UniversalBindingFlags );
+            if( _listsByDef == null )
+            {
+                CCL_Log.Trace(
+                    Verbosity.FatalErrors,
+                    "Unable to get field 'listsByDef' in 'ListerThings'",
+                    "ListerThings_Extensions" );
+            }
+        }
+
+        public static List<Thing>[]         ListsByGroup( this ListerThings listerThings )
+        {
+            return _listsByGroup.GetValue( listerThings ) as List<Thing>[];
         }
 
-        public static List<Thing>           ListsByGroup( this ThingRequestGroup group )
+        public static Dictionary<ThingDef,List<Thing>> ListsByDef( this ListerThings listerThings )
         {
-            var listsByGroup = _listsByGroup.GetValue( Find.ListerThings ) as List<Thing>[];
-            return listsByGroup[ (int) group ];
+            return _listsByDef.GetValue( listerThings ) as Dictionary<ThingDef,List<Thing>>;
         }
 
     }
diff --git a/DLL_Project/Extensions/RecipeDef_Extensions.cs b/DLL_Project/Extensions/RecipeDef_Extensions.cs
index 87b56e4..dabb43f 100644
--- a/DLL_Project/Extensions/RecipeDef_Extensions.cs
+++ b/DLL_Project/Extensions/RecipeDef_Extensions.cs
@@ -320,10 +320,10 @@ public static List< ThingDef >      GetThingsLocked( this RecipeDef recipeDef, r
                         // If it's a single research project, add that
                         researchDefs.AddUnique( a.researchDefs[ 0 ] );
                     }
-                    else if( a.ResearchConsolidator != null )
+                    else if( a.HelpConsolidator != null )
                     {
                         // Add the advanced project instead
-                        researchDefs.AddUnique( a.ResearchConsolidator );
+                        researchDefs.AddUnique( a.HelpConsolidator );
                     }
                 }
             }
diff --git a/DLL_Project/Extensions/ThingDef_Extensions.cs b/DLL_Project/Extensions/ThingDef_Extensions.cs
index 77110a9..3fbb246 100644
--- a/DLL_Project/Extensions/ThingDef_Extensions.cs
+++ b/DLL_Project/Extensions/ThingDef_Extensions.cs
@@ -270,10 +270,10 @@ public static List< RecipeDef >     GetRecipesLocked( this ThingDef thingDef, re
                         // If it's a single research project, add that
                         researchDefs.AddUnique( a.researchDefs[ 0 ] );
                     }
-                    else if( a.ResearchConsolidator != null )
+                    else if( a.HelpConsolidator != null )
                     {
                         // Add the advanced project instead
-                        researchDefs.AddUnique( a.ResearchConsolidator );
+                        researchDefs.AddUnique( a.HelpConsolidator );
                     }
                 }
             }
@@ -359,6 +359,12 @@ public static CompProperties_Rottable CompProperties_Rottable ( this ThingDef th
 
         #endregion
 
+        public static List<Thing>           ListOfThingsByDef( this ThingDef thingDef )
+        {
+            var listsByDef = Find.ListerThings.ListsByDef();
+            return listsByDef[ thingDef ];
+        }
+
     }
 
 }
diff --git a/DLL_Project/Extensions/ThingRequestGroup_Extensions.cs b/DLL_Project/Extensions/ThingRequestGroup_Extensions.cs
new file mode 100644
index 0000000..e7ee7bf
--- /dev/null
+++ b/DLL_Project/Extensions/ThingRequestGroup_Extensions.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+using RimWorld;
+using Verse;
+
+namespace CommunityCoreLibrary
+{
+
+    public static class ThingRequestGroup_Extensions
+    {
+
+        public static List<Thing>           ListOfThingsByGroup( this ThingRequestGroup group )
+        {
+            var listsByGroup = Find.ListerThings.ListsByGroup();
+            return listsByGroup[ (int) group ];
+        }
+
+    }
+
+}
diff --git a/DLL_Project/MainMenus/MainMenu_LoadGame.cs b/DLL_Project/MainMenus/MainMenu_LoadGame.cs
index d44b034..2673d35 100644
--- a/DLL_Project/MainMenus/MainMenu_LoadGame.cs
+++ b/DLL_Project/MainMenus/MainMenu_LoadGame.cs
@@ -23,6 +23,7 @@ public override bool RenderNow( bool anyMapFiles )
 
 		public override void ClickAction()
 		{
+            MainMenuDrawer_Extensions.CloseMainTab();
 			Find.WindowStack.Add( (Window)new Dialog_MapList_Load() );
 		}
 
diff --git a/DLL_Project/MainMenus/MainMenu_Options.cs b/DLL_Project/MainMenus/MainMenu_Options.cs
index 5ed8624..f61e943 100644
--- a/DLL_Project/MainMenus/MainMenu_Options.cs
+++ b/DLL_Project/MainMenus/MainMenu_Options.cs
@@ -10,6 +10,7 @@ public class MainMenu_Options : MainMenu
 
 		public override void ClickAction()
 		{
+            MainMenuDrawer_Extensions.CloseMainTab();
 			Find.WindowStack.Add( (Window)new Dialog_Options() );
 		}
 
diff --git a/DLL_Project/MainMenus/MainMenu_QuitToMain.cs b/DLL_Project/MainMenus/MainMenu_QuitToMain.cs
index 6a5fa98..1fdfd5f 100644
--- a/DLL_Project/MainMenus/MainMenu_QuitToMain.cs
+++ b/DLL_Project/MainMenus/MainMenu_QuitToMain.cs
@@ -18,14 +18,20 @@ public override bool RenderNow( bool anyMapFiles )
 
 		public override void ClickAction()
 		{
-			Find.WindowStack.Add( (Window)new Dialog_Confirm(
-				"ConfirmQuit".Translate(),
-				() =>
-        			{
-        				Application.LoadLevel( "Entry" );
-        			},
-				false
-			) );
+            if( GameDataSaveLoader.CurrentMapStateIsValuable )
+            {
+    			Find.WindowStack.Add( (Window)new Dialog_Confirm(
+    				"ConfirmQuit".Translate(),
+    				RootMap.GoToMainMenu,
+    				true,
+                    null,
+                    true
+    			) );
+            }
+            else
+            {
+                RootMap.GoToMainMenu();
+            }
 		}
 
 	}
diff --git a/DLL_Project/MainMenus/MainMenu_QuitToOS.cs b/DLL_Project/MainMenus/MainMenu_QuitToOS.cs
index caa4f22..7d9f04f 100644
--- a/DLL_Project/MainMenus/MainMenu_QuitToOS.cs
+++ b/DLL_Project/MainMenus/MainMenu_QuitToOS.cs
@@ -29,15 +29,20 @@ public override bool RenderNow( bool anyMapFiles )
 
 		public override void ClickAction()
 		{
-			if( Current.ProgramState == ProgramState.MapPlaying )
-			{
+			if(
+                ( Current.ProgramState == ProgramState.MapPlaying )&&
+			( GameDataSaveLoader.CurrentMapStateIsValuable )
+            )
+            {
 				Find.WindowStack.Add( (Window)new Dialog_Confirm(
 					"ConfirmQuit".Translate(),
 					Root.Shutdown,
-					false
+					true,
+                    null,
+                    true
 				) );
-			}
-			else
+            }
+            else
 			{
 				Root.Shutdown();
 			}
diff --git a/DLL_Project/MainMenus/MainMenu_SaveGame.cs b/DLL_Project/MainMenus/MainMenu_SaveGame.cs
index fed2094..b0c9687 100644
--- a/DLL_Project/MainMenus/MainMenu_SaveGame.cs
+++ b/DLL_Project/MainMenus/MainMenu_SaveGame.cs
@@ -26,6 +26,7 @@ public override bool RenderNow( bool anyMapFiles )
 
 		public override void ClickAction()
 		{
+            MainMenuDrawer_Extensions.CloseMainTab();
 			Find.WindowStack.Add( (Window)new Dialog_MapList_Save() );
 		}
 
diff --git a/DLL_Project/MapComponents/HideItemManager.cs b/DLL_Project/MapComponents/HideItemManager.cs
index 70fa845..93be4b3 100644
--- a/DLL_Project/MapComponents/HideItemManager.cs
+++ b/DLL_Project/MapComponents/HideItemManager.cs
@@ -32,7 +32,7 @@ private static List<Thing>          listHasGUIOverlay
         {
             get
             {
-                return ThingRequestGroup.HasGUIOverlay.ListsByGroup();
+                return ThingRequestGroup.HasGUIOverlay.ListOfThingsByGroup();
             }
         }
 
diff --git a/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Artillery.xml b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Artillery.xml
index b84238f..03d5e5a 100644
--- a/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Artillery.xml	
+++ b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Artillery.xml	
@@ -24,7 +24,7 @@
     <CommunityCoreLibrary.AdvancedResearchDef>
 
         <defName>MakeArtilleryShellsMachiningTable</defName>
-        <Priority>0</Priority>
+        <Priority>1</Priority>
 
         <researchDefs>
             <li>Mortars</li>
diff --git a/_Mod/Modders Resource/Community Core Library/Assemblies/Community Core Library.dll b/_Mod/Modders Resource/Community Core Library/Assemblies/Community Core Library.dll
index 3565804..a21f671 100644
Binary files a/_Mod/Modders Resource/Community Core Library/Assemblies/Community Core Library.dll and b/_Mod/Modders Resource/Community Core Library/Assemblies/Community Core Library.dll differ
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/About/About.xml b/_Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/About/About.xml
deleted file mode 100644
index 235d486..0000000
--- a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/About/About.xml	
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ModMetaData>
-    <name>Advanced Research - Example 1 - Locking and Unlocking Buildings</name>
-    <author>RimWorld CCL Team</author>
-    <url>n/a</url>
-    <targetVersion>0.15.1284</targetVersion>
-    <description>
-This is an example of how to lock and unlock buildings as new research is complete.
-
-Demonstrates:
-	CommunityCoreLibrary.AdvancedResearchDef to lock and unlock buildings
-	Creating automatic help menu entries for advanced research
-	SequencedInjectionSet_ThingDefAvailability in a CommunityCoreLibrary.ModHelperDef to change the designation category of a ThingDef
-    </description>
-</ModMetaData>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/Defs/AdvancedResearchDefs/Building_Example.xml b/_Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/Defs/AdvancedResearchDefs/Building_Example.xml
deleted file mode 100644
index ee21923..0000000
--- a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/Defs/AdvancedResearchDefs/Building_Example.xml	
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <CommunityCoreLibrary.AdvancedResearchDef>
-        <!--
-            This def disables the normal crypto sleep
-        -->
-
-        <defName>HideCryptoSleep</defName>
-        <Priority>-1</Priority>
-
-        <researchDefs>
-            <li>Cryptosleep</li>
-            <li>AncientTechnology</li>
-        </researchDefs>
-
-        <HideDefs>true</HideDefs>
-
-        <ConsolidateHelp>true</ConsolidateHelp>
-        <label>Ancient Cryptosleep</label>
-        <description>Completion of this project allows you to build the ancient crytosleep casket which will replace the regular one.</description>
-
-        <thingDefs>
-            <li>CryptosleepCasket</li>
-        </thingDefs>
-
-    </CommunityCoreLibrary.AdvancedResearchDef>
-
-    <CommunityCoreLibrary.AdvancedResearchDef>
-        <!--
-            This def enables the ancient crypto sleep
-        -->
-
-        <defName>BuildAncientCryptoSleep</defName>
-        <Priority>0</Priority>
-
-        <researchDefs>
-            <li>Cryptosleep</li>
-            <li>AncientTechnology</li>
-        </researchDefs>
-
-        <thingDefs>
-            <li>AncientCryptosleepCasket</li>
-        </thingDefs>
-
-    </CommunityCoreLibrary.AdvancedResearchDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/About/About.xml b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/About/About.xml
new file mode 100644
index 0000000..2a26d40
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/About/About.xml	
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ModMetaData>
+    <name>Example 13 - Food &amp; Drug Synthesizer</name>
+    <author>RimWorld CCL Team</author>
+    <url>n/a</url>
+    <targetVersion>0.15.1284</targetVersion>
+    <description>
+This is an example of a food and drug synthesizer.
+
+Demonstrates:
+	Requiring linked facilities for recipes (AdvancedRecipeDef)
+	Unlocking recipes on buildings requiring multiple research projects (AdvancedResearchDef)
+	Creating a machine which can dispense food &amp; drugs to pawns:
+		Building_AutomatedFactory
+		CompAutomatedFactory
+		CompHopperUser
+		CompProperties_AffectedByFacilities
+		CompProperties_AutomatedFactory
+		IHopperUser (Building_AutomatedFactory)
+		ITab_AutomatedFactory
+		PlaceWorker_HopperMagnifier
+	Injecting a link to a facility into an building (ModHelperDef; SequencedInjectionSet_Facility)
+	Changing the designation category of a ThingDef (ModHelperDef; SequencedInjectionSet_ThingDefAvailability)
+</description>
+
+</ModMetaData>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/ARD_Synthesizer_Drugs.xml b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/Example_13_ARD_Synthesizer_Drugs.xml
similarity index 58%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/ARD_Synthesizer_Drugs.xml
rename to _Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/Example_13_ARD_Synthesizer_Drugs.xml
index 8057016..f084dee 100644
--- a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/ARD_Synthesizer_Drugs.xml	
+++ b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/Example_13_ARD_Synthesizer_Drugs.xml	
@@ -3,120 +3,120 @@
 
     <CommunityCoreLibrary.AdvancedResearchDef>
 
-        <defName>AdvancedDrugSynthesis</defName>
+        <defName>Example_13_AdvancedDrugSynthesis</defName>
         <Priority>0</Priority>
 
         <researchDefs>
-            <li>DrugSynthesis</li>
+            <li>Example_13_DrugSynthesis</li>
         </researchDefs>
 
         <recipeDefs>
-            <li>SynthesizeSmokeleafJoint</li>
+            <li>Example_13_SynthesizeSmokeleafJoint</li>
         </recipeDefs>
 
         <thingDefs>
-            <li>Synthesizer</li>
+            <li>Example_13_Synthesizer</li>
         </thingDefs>
 
     </CommunityCoreLibrary.AdvancedResearchDef>
 
     <CommunityCoreLibrary.AdvancedResearchDef>
 
-        <defName>AdvancedDrugSynthesisBeer</defName>
+        <defName>Example_13_AdvancedDrugSynthesisBeer</defName>
         <Priority>0</Priority>
 
         <researchDefs>
-            <li>DrugSynthesis</li>
+            <li>Example_13_DrugSynthesis</li>
             <li>Brewing</li>
         </researchDefs>
 
         <recipeDefs>
-            <li>SynthesizeBeer</li>
+            <li>Example_13_SynthesizeBeer</li>
         </recipeDefs>
 
         <thingDefs>
-            <li>Synthesizer</li>
+            <li>Example_13_Synthesizer</li>
         </thingDefs>
 
     </CommunityCoreLibrary.AdvancedResearchDef>
 
     <CommunityCoreLibrary.AdvancedResearchDef>
 
-        <defName>AdvancedDrugSynthesisMalariBlock</defName>
+        <defName>Example_13_AdvancedDrugSynthesisMalariBlock</defName>
         <Priority>0</Priority>
 
         <researchDefs>
-            <li>DrugSynthesis</li>
+            <li>Example_13_DrugSynthesis</li>
             <li>MalariBlockProduction</li>
         </researchDefs>
 
         <recipeDefs>
-            <li>SynthesizeMalariBlock</li>
+            <li>Example_13_SynthesizeMalariBlock</li>
         </recipeDefs>
 
         <thingDefs>
-            <li>Synthesizer</li>
+            <li>Example_13_Synthesizer</li>
         </thingDefs>
 
     </CommunityCoreLibrary.AdvancedResearchDef>
 
     <CommunityCoreLibrary.AdvancedResearchDef>
 
-        <defName>AdvancedDrugSynthesisPsychite</defName>
+        <defName>Example_13_AdvancedDrugSynthesisPsychite</defName>
         <Priority>0</Priority>
 
         <researchDefs>
-            <li>DrugSynthesis</li>
+            <li>Example_13_DrugSynthesis</li>
             <li>PsychiteRefining</li>
         </researchDefs>
 
         <recipeDefs>
-            <li>SynthesizeFlake</li>
-            <li>SynthesizeYayo</li>
+            <li>Example_13_SynthesizeFlake</li>
+            <li>Example_13_SynthesizeYayo</li>
         </recipeDefs>
 
         <thingDefs>
-            <li>Synthesizer</li>
+            <li>Example_13_Synthesizer</li>
         </thingDefs>
 
     </CommunityCoreLibrary.AdvancedResearchDef>
 
     <CommunityCoreLibrary.AdvancedResearchDef>
 
-        <defName>AdvancedDrugSynthesisGoJuice</defName>
+        <defName>Example_13_AdvancedDrugSynthesisGoJuice</defName>
         <Priority>0</Priority>
 
         <researchDefs>
-            <li>DrugSynthesis</li>
+            <li>Example_13_DrugSynthesis</li>
             <li>GoJuiceProduction</li>
         </researchDefs>
 
         <recipeDefs>
-            <li>SynthesizeGoJuice</li>
+            <li>Example_13_SynthesizeGoJuice</li>
         </recipeDefs>
 
         <thingDefs>
-            <li>Synthesizer</li>
+            <li>Example_13_Synthesizer</li>
         </thingDefs>
 
     </CommunityCoreLibrary.AdvancedResearchDef>
 
     <CommunityCoreLibrary.AdvancedResearchDef>
 
-        <defName>AdvancedDrugSynthesisWakeUp</defName>
+        <defName>Example_13_AdvancedDrugSynthesisWakeUp</defName>
         <Priority>0</Priority>
 
         <researchDefs>
-            <li>DrugSynthesis</li>
+            <li>Example_13_DrugSynthesis</li>
             <li>WakeUpProduction</li>
         </researchDefs>
 
         <recipeDefs>
-            <li>SynthesizeWakeUp</li>
+            <li>Example_13_SynthesizeWakeUp</li>
         </recipeDefs>
 
         <thingDefs>
-            <li>Synthesizer</li>
+            <li>Example_13_Synthesizer</li>
         </thingDefs>
 
     </CommunityCoreLibrary.AdvancedResearchDef>
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/ARD_Synthesizer_Meals.xml b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/Example_13_ARD_Synthesizer_Meals.xml
similarity index 57%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/ARD_Synthesizer_Meals.xml
rename to _Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/Example_13_ARD_Synthesizer_Meals.xml
index e2c4ca8..3f65d94 100644
--- a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/ARD_Synthesizer_Meals.xml	
+++ b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/AdvancedResearchDefs/Example_13_ARD_Synthesizer_Meals.xml	
@@ -3,38 +3,38 @@
 
     <CommunityCoreLibrary.AdvancedResearchDef>
 
-        <defName>AdvancedFineMealSynthesis</defName>
+        <defName>Example_13_AdvancedFineMealSynthesis</defName>
         <Priority>0</Priority>
 
         <researchDefs>
-            <li>FineMealSynthesis</li>
+            <li>Example_13_FineMealSynthesis</li>
         </researchDefs>
 
         <recipeDefs>
-            <li>SynthesizeMealFine</li>
+            <li>Example_13_SynthesizeMealFine</li>
         </recipeDefs>
 
         <thingDefs>
-            <li>Synthesizer</li>
+            <li>Example_13_Synthesizer</li>
         </thingDefs>
 
     </CommunityCoreLibrary.AdvancedResearchDef>
 
     <CommunityCoreLibrary.AdvancedResearchDef>
 
-        <defName>AdvancedLavishMealSynthesis</defName>
+        <defName>Example_13_AdvancedLavishMealSynthesis</defName>
         <Priority>0</Priority>
 
         <researchDefs>
-            <li>LavishMealSynthesis</li>
+            <li>Example_13_LavishMealSynthesis</li>
         </researchDefs>
 
         <recipeDefs>
-            <li>SynthesizeMealLavish</li>
+            <li>Example_13_SynthesizeMealLavish</li>
         </recipeDefs>
 
         <thingDefs>
-            <li>Synthesizer</li>
+            <li>Example_13_Synthesizer</li>
         </thingDefs>
 
     </CommunityCoreLibrary.AdvancedResearchDef>
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/ModHelperDefs/MHD_Synthesizer.xml b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/ModHelperDefs/Example_13_MHD_Synthesizer.xml
similarity index 84%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/ModHelperDefs/MHD_Synthesizer.xml
rename to _Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/ModHelperDefs/Example_13_MHD_Synthesizer.xml
index 6dcb23b..f8967a1 100644
--- a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/ModHelperDefs/MHD_Synthesizer.xml	
+++ b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/ModHelperDefs/Example_13_MHD_Synthesizer.xml	
@@ -2,9 +2,9 @@
 <Defs>
 
     <CommunityCoreLibrary.ModHelperDef>
-        <defName>MHDSynthesizer</defName>
+        <defName>Example_13_MHD_Synthesizer</defName>
 
-        <ModName>Building Automated Factory - Example 1 - Food &amp; Drug Synthesizer</ModName>
+        <ModName>Example 13 - Food &amp; Drug Synthesizer</ModName>
 
         <minCCLVersion>0.15.0</minCCLVersion>
 
@@ -24,7 +24,7 @@
             <li Class="CommunityCoreLibrary.SequencedInjectionSet_Facility">
                 <facility>MultiAnalyzer</facility>
                 <targetDefs>
-                    <li>Synthesizer</li>
+                    <li>Example_13_Synthesizer</li>
                 </targetDefs>
             </li>
 
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/RecipeDefs/RD_Synthesizer_Drugs.xml b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/RecipeDefs/Example_13_RD_Synthesizer_Drugs.xml
similarity index 85%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/RecipeDefs/RD_Synthesizer_Drugs.xml
rename to _Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/RecipeDefs/Example_13_RD_Synthesizer_Drugs.xml
index 2f034f7..2d15648 100644
--- a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/RecipeDefs/RD_Synthesizer_Drugs.xml	
+++ b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/RecipeDefs/Example_13_RD_Synthesizer_Drugs.xml	
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
-    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" Abstract="true" Name="SynthesizedDrugBase">
+    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" Abstract="true" Name="Example_13_SynthesizedDrugBase">
         <allowMixingIngredients>false</allowMixingIngredients>
         <requiredFacilities>
             <li>MultiAnalyzer</li>
         </requiredFacilities>
     </RecipeDef>
 
-    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="SynthesizedDrugBase">
-        <defName>SynthesizeBeer</defName>
+    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="Example_13_SynthesizedDrugBase">
+        <defName>Example_13_SynthesizeBeer</defName>
         <label>synthesize beer</label>
-        <description>synthesizes beer from hops.</description>
-        <jobString>Synthesizing beer.</jobString>
+        <description>synthesizes a beer from hops.</description>
+        <jobString>Synthesizing a beer.</jobString>
         <workAmount>100</workAmount>
         <ingredients>
             <li>
@@ -34,8 +34,8 @@
         </products>
     </RecipeDef>
 
-    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="SynthesizedDrugBase">
-        <defName>SynthesizeFlake</defName>
+    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="Example_13_SynthesizedDrugBase">
+        <defName>Example_13_SynthesizeFlake</defName>
         <label>synthesize flake</label>
         <description>synthesizes flake from psychoid leaves.</description>
         <jobString>Synthesizing flake.</jobString>
@@ -60,8 +60,8 @@
         </products>
     </RecipeDef>
 
-    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="SynthesizedDrugBase">
-        <defName>SynthesizeYayo</defName>
+    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="Example_13_SynthesizedDrugBase">
+        <defName>Example_13_SynthesizeYayo</defName>
         <label>synthesize yayo</label>
         <description>synthesizes yayo from psychoid leaves.</description>
         <jobString>Synthesizing yayo.</jobString>
@@ -86,8 +86,8 @@
         </products>
     </RecipeDef>
 
-    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="SynthesizedDrugBase">
-        <defName>SynthesizeGoJuice</defName>
+    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="Example_13_SynthesizedDrugBase">
+        <defName>Example_13_SynthesizeGoJuice</defName>
         <label>synthesize go-juice</label>
         <description>synthesizes go-juice from neutroamine and psychoid leaves.</description>
         <jobString>Synthesizing go-juice.</jobString>
@@ -121,8 +121,8 @@
         </products>
     </RecipeDef>
 
-    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="SynthesizedDrugBase">
-        <defName>SynthesizeMalariBlock</defName>
+    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="Example_13_SynthesizedDrugBase">
+        <defName>Example_13_SynthesizeMalariBlock</defName>
         <label>synthesize malari-block</label>
         <description>synthesizes malari-block from neutroamine.</description>
         <jobString>Synthesizing malari-block.</jobString>
@@ -147,11 +147,11 @@
         </products>
     </RecipeDef>
 
-    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="SynthesizedDrugBase">
-        <defName>SynthesizeSmokeleafJoint</defName>
+    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="Example_13_SynthesizedDrugBase">
+        <defName>Example_13_SynthesizeSmokeleafJoint</defName>
         <label>synthesize smokeleaf joint</label>
-        <description>synthesizes smokeleaf joint from smokeleaf leaves.</description>
-        <jobString>Synthesizing smokeleaf joint.</jobString>
+        <description>synthesizes a smokeleaf joint from smokeleaf leaves.</description>
+        <jobString>Synthesizing a smokeleaf joint.</jobString>
         <workAmount>100</workAmount>
         <ingredients>
             <li>
@@ -173,8 +173,8 @@
         </products>
     </RecipeDef>
 
-    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="SynthesizedDrugBase">
-        <defName>SynthesizeWakeUp</defName>
+    <RecipeDef Class="CommunityCoreLibrary.AdvancedRecipeDef" ParentName="Example_13_SynthesizedDrugBase">
+        <defName>Example_13_SynthesizeWakeUp</defName>
         <label>synthesize wake-up</label>
         <description>synthesizes wake-up from neutroamine.</description>
         <jobString>Synthesizing wake-up.</jobString>
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/RecipeDefs/RD_Synthesizer_Food.xml b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/RecipeDefs/Example_13_RD_Synthesizer_Food.xml
similarity index 88%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/RecipeDefs/RD_Synthesizer_Food.xml
rename to _Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/RecipeDefs/Example_13_RD_Synthesizer_Food.xml
index c8341a3..5a41d17 100644
--- a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/RecipeDefs/RD_Synthesizer_Food.xml	
+++ b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/RecipeDefs/Example_13_RD_Synthesizer_Food.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RecipeDefs>
 
-    <RecipeDef Abstract="true" Name="SynthesizedMealBase">
+    <RecipeDef Abstract="true" Name="Example_13_SynthesizedMealBase">
         <allowMixingIngredients>true</allowMixingIngredients>
         <ingredientValueGetterClass>IngredientValueGetter_Nutrition</ingredientValueGetterClass>
         <fixedIngredientFilter>
@@ -22,12 +22,13 @@
             <exceptedThingDefs>
                 <li>Human_Meat</li>
                 <li>Hay</li>
+                <li>InsectMeat</li>
             </exceptedThingDefs>
         </defaultIngredientFilter>
     </RecipeDef>
 
-    <RecipeDef ParentName="SynthesizedMealBase">
-        <defName>SynthesizeMealSimple</defName>
+    <RecipeDef ParentName="Example_13_SynthesizedMealBase">
+        <defName>Example_13_SynthesizeMealSimple</defName>
         <label>synthesize simple meal</label>
         <description>Synthesizes a straightforward meal from one ingredient.</description>
         <jobString>Synthesizing simple meal.</jobString>
@@ -47,8 +48,8 @@
         <workAmount>200</workAmount>
     </RecipeDef>
 
-    <RecipeDef ParentName="SynthesizedMealBase">
-        <defName>SynthesizeMealFine</defName>
+    <RecipeDef ParentName="Example_13_SynthesizedMealBase">
+        <defName>Example_13_SynthesizeMealFine</defName>
         <label>synthesize fine meal</label>
         <description>Synthesizes a somewhat complex meal from a combination of raw meat and raw plant ingredients.</description>
         <jobString>Synthesizing fine meal.</jobString>
@@ -77,8 +78,8 @@
         <workAmount>275</workAmount>
     </RecipeDef>
 
-    <RecipeDef ParentName="SynthesizedMealBase">
-        <defName>SynthesizeMealLavish</defName>
+    <RecipeDef ParentName="Example_13_SynthesizedMealBase">
+        <defName>Example_13_SynthesizeMealLavish</defName>
         <label>synthesize lavish meal</label>
         <description>Synthesizes a very complex meal from a combination of raw meat and raw plant ingredients. Unlike a cooked meal, none of the ingredients are wasted but it still requires more ingredients than a fine meal.</description>
         <jobString>Synthesizing lavish meal.</jobString>
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/ResearchProjectDefs/RD_Synthesizer.xml b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/ResearchProjectDefs/Example_13_RPD_Synthesizer.xml
similarity index 65%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/ResearchProjectDefs/RD_Synthesizer.xml
rename to _Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/ResearchProjectDefs/Example_13_RPD_Synthesizer.xml
index ac1be21..66b7d63 100644
--- a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/ResearchProjectDefs/RD_Synthesizer.xml	
+++ b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/ResearchProjectDefs/Example_13_RPD_Synthesizer.xml	
@@ -3,13 +3,13 @@
 
     <!-- Tier 1 research -->
 
-    <ResearchProjectDef Abstract="True" Name="SynthesisResearchBase">
+    <ResearchProjectDef Abstract="True" Name="Example_13_SynthesisResearchBase">
         <techLevel>Spacer</techLevel>
         <requiredResearchBuilding>HiTechResearchBench</requiredResearchBuilding>
     </ResearchProjectDef>
 
-    <ResearchProjectDef ParentName="SynthesisResearchBase">
-        <defName>MealSynthesis</defName>
+    <ResearchProjectDef ParentName="Example_13_SynthesisResearchBase">
+        <defName>Example_13_MealSynthesis</defName>
         <label>meal synthesis</label>
         <description>Synthesizers can be built which can create actual meals instead of just disgusting paste.</description>
         <baseCost>1000</baseCost>
@@ -20,42 +20,42 @@
 
     <!-- Tier 1.5 - Meal research -->
 
-    <ResearchProjectDef ParentName="SynthesisResearchBase">
-        <defName>FineMealSynthesis</defName>
+    <ResearchProjectDef ParentName="Example_13_SynthesisResearchBase">
+        <defName>Example_13_FineMealSynthesis</defName>
         <label>fine meal synthesis</label>
         <description>Fine meals can be synthesized at synthesizers.</description>
         <baseCost>2000</baseCost>
         <prerequisites>
-            <li>MealSynthesis</li>
+            <li>Example_13_MealSynthesis</li>
             <li>MultiAnalyzer</li>
         </prerequisites>
     </ResearchProjectDef>
 
     <!-- Tier 2 - Drug and meal research -->
 
-    <ResearchProjectDef Abstract="True" Name="DrugSynthesisResearchBase" ParentName="SynthesisResearchBase">
+    <ResearchProjectDef Abstract="True" Name="Example_13_DrugSynthesisResearchBase" ParentName="Example_13_SynthesisResearchBase">
         <requiredResearchFacilities>
             <li>MultiAnalyzer</li>
         </requiredResearchFacilities>
     </ResearchProjectDef>
 
-    <ResearchProjectDef ParentName="DrugSynthesisResearchBase">
-        <defName>LavishMealSynthesis</defName>
+    <ResearchProjectDef ParentName="Example_13_DrugSynthesisResearchBase">
+        <defName>Example_13_LavishMealSynthesis</defName>
         <label>lavish meal synthesis</label>
         <description>Lavish meals can be synthesized at synthesizers.</description>
         <baseCost>3000</baseCost>
         <prerequisites>
-            <li>FineMealSynthesis</li>
+            <li>Example_13_FineMealSynthesis</li>
         </prerequisites>
     </ResearchProjectDef>
 
-    <ResearchProjectDef ParentName="DrugSynthesisResearchBase">
-        <defName>DrugSynthesis</defName>
+    <ResearchProjectDef ParentName="Example_13_DrugSynthesisResearchBase">
+        <defName>Example_13_DrugSynthesis</defName>
         <label>drug synthesis</label>
         <description>Synthesizers will be able to also synthesize drugs from the simple to the complex.</description>
         <baseCost>2500</baseCost>
         <prerequisites>
-            <li>MealSynthesis</li>
+            <li>Example_13_MealSynthesis</li>
             <li>DrugProduction</li>
             <li>MultiAnalyzer</li>
         </prerequisites>
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/ThingDefs/TD_Synthesizer.xml b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/ThingDefs/Example_13_TD_Synthesizer.xml
similarity index 87%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/ThingDefs/TD_Synthesizer.xml
rename to _Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/ThingDefs/Example_13_TD_Synthesizer.xml
index 8fc9015..2e8dcf1 100644
--- a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/Defs/ThingDefs/TD_Synthesizer.xml	
+++ b/_Mod/Modders Resource/Examples/Example 13 - Food & Drug Synthesizer/Defs/ThingDefs/Example_13_TD_Synthesizer.xml	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-    <ThingDef Name="BuildingBase" Abstract="True">
+    <ThingDef Name="Example_13_BuildingBase" Abstract="True">
         <category>Building</category>
         <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
         <selectable>true</selectable>
@@ -12,8 +12,8 @@
         <filthLeaving>BuildingRubble</filthLeaving>
     </ThingDef>
 
-    <ThingDef ParentName="BuildingBase">
-        <defName>Synthesizer</defName>
+    <ThingDef ParentName="Example_13_BuildingBase">
+        <defName>Example_13_Synthesizer</defName>
         <label>synthesizer</label>
         <thingClass>CommunityCoreLibrary.Building_AutomatedFactory</thingClass>
         <graphicData>
@@ -48,6 +48,11 @@
             </li>
             <li Class="CompProperties_Flickable"/>
             <li Class="CompProperties_Breakdownable"/>
+            <li Class="CompProperties_AffectedByFacilities">
+                <linkableFacilities>
+                    <li>MultiAnalyzer</li>
+                </linkableFacilities>
+            </li>
             <li Class="CommunityCoreLibrary.CompProperties_HopperUser">
                 <compClass>CommunityCoreLibrary.CompHopperUser</compClass>
             </li>
@@ -56,14 +61,6 @@
                 <outputVector>DirectToPawn</outputVector>
                 <productionMode>PawnInteractionOnly</productionMode>
             </li>
-            <li Class="CommunityCoreLibrary.CompProperties_AffectedByFacilities">
-                <!-- This must be set true to connect this building to facilities flagged as canLinkToMedBedsOnly (Vitals Monitor) -->
-                <overrideBedOnly>true</overrideBedOnly>
-                <linkableFacilities>
-                    <li>MultiAnalyzer</li>
-                    <li>VitalsMonitor</li>
-                </linkableFacilities>
-            </li>
         </comps>
         <size>(3,4)</size>
         <costList>
@@ -79,10 +76,10 @@
             <li>CommunityCoreLibrary.PlaceWorker_HopperMagnifier</li>
         </placeWorkers>
         <recipes>
-            <li>SynthesizeMealSimple</li>
+            <li>Example_13_SynthesizeMealSimple</li>
         </recipes>
         <researchPrerequisites>
-            <li>MealSynthesis</li>
+            <li>Example_13_MealSynthesis</li>
         </researchPrerequisites>
         <inspectorTabs>
             <li>CommunityCoreLibrary.ITab_AutomatedFactory</li>
diff --git a/_Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/About/About.xml b/_Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/About/About.xml
new file mode 100644
index 0000000..4a86320
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/About/About.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ModMetaData>
+    <name>Example 5 - Ancient Cryptosleep</name>
+    <author>RimWorld CCL Team</author>
+    <url>n/a</url>
+    <targetVersion>0.15.1284</targetVersion>
+    <description>
+This is an example of how to lock and unlock buildings as research is completed.
+
+Demonstrates:
+	Locking and unlocking buildings in the architect menu requiring multiple research projects (AdvancedResearchDef)
+	Creating automatic help menu entries for groups of research (AdvancedResearchDef)
+	Changing the designation category of a ThingDef (ModHelperDef; SequencedInjectionSet_ThingDefAvailability)
+</description>
+</ModMetaData>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/Defs/AdvancedResearchDefs/Example_13_ARD_Crypto.xml b/_Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/Defs/AdvancedResearchDefs/Example_13_ARD_Crypto.xml
new file mode 100644
index 0000000..65d23d9
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/Defs/AdvancedResearchDefs/Example_13_ARD_Crypto.xml	
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <CommunityCoreLibrary.AdvancedResearchDef>
+        <!--
+            This def disables the normal crypto sleep
+        -->
+
+        <defName>Example_5_HideCryptosleep</defName>
+        
+        <!--
+            Flagging the Priority as -1 tells the library that any HelpDef to be generated
+            based on matching researchDefs should use this def as the parent.
+        -->
+        <Priority>-1</Priority>
+
+        <!--
+            The list or "group" of research projects which must be complete for this def to trigger.
+        -->
+        <researchDefs>
+            <li>Cryptosleep</li>
+            <li>Example_5_AncientTechnology</li>
+        </researchDefs>
+
+        <!--
+            Disable the normal cryptosleep
+        -->
+        <HideDefs>true</HideDefs>
+
+        <!--
+            Generate a HelpDef with the supplied label and description for this def and
+            consolidate all defs with the same researchDefs to use this def as their parent.
+        -->
+        <ConsolidateHelp>true</ConsolidateHelp>
+        <label>Ancient Cryptosleep</label>
+        <description>Completion of this project allows you to build the ancient crytosleep casket which will replace the regular one.</description>
+
+        <!--
+            And finally the list of things it's actually effecting.
+        -->
+        <thingDefs>
+            <li>CryptosleepCasket</li>
+        </thingDefs>
+
+    </CommunityCoreLibrary.AdvancedResearchDef>
+
+    <CommunityCoreLibrary.AdvancedResearchDef>
+        <!--
+            This def enables the ancient crypto sleep
+        -->
+
+        <defName>Example_5_BuildAncientCryptoSleep</defName>
+
+        <!--
+            Make sure no other def with a matching researchDefs list doesn't have the same
+            priority as any other.  The priority is the order which the defs are processed
+            and the library will throw an error if you use two defs with matching researchDefs
+            with the same priority.
+        -->
+        <Priority>0</Priority>
+
+        <!--
+            The order of the researchDefs doesn't have to match element-for-element.  Every
+            item in each list is checked against the other defs researchDefs and vice versa.
+        -->
+        <researchDefs>
+            <li>Example_5_AncientTechnology</li>
+            <li>Cryptosleep</li>
+        </researchDefs>
+
+        <!--
+            The default nature is to enable stuff so this def doesn't specifically need to
+            say what it's doing to the list of things.
+        -->
+        <thingDefs>
+            <li>AncientCryptosleepCasket</li>
+        </thingDefs>
+
+    </CommunityCoreLibrary.AdvancedResearchDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/Defs/ModHelperDefs/Building_Example.xml b/_Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/Defs/ModHelperDefs/Example_5_MHD_Crypto.xml
similarity index 82%
rename from _Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/Defs/ModHelperDefs/Building_Example.xml
rename to _Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/Defs/ModHelperDefs/Example_5_MHD_Crypto.xml
index 01f9693..ba6946a 100644
--- a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/Defs/ModHelperDefs/Building_Example.xml	
+++ b/_Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/Defs/ModHelperDefs/Example_5_MHD_Crypto.xml	
@@ -2,9 +2,9 @@
 <Defs>
 
     <CommunityCoreLibrary.ModHelperDef>
-        <defName>AdvancedResearchBuildingExample</defName>
+        <defName>Example_5_MHD_AncientCryptosleep</defName>
 
-        <ModName>Advanced Research Building Example</ModName>
+        <ModName>Example 5 - Ancient Cryptosleep</ModName>
 
         <minCCLVersion>0.15.0</minCCLVersion>
 
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/Defs/ResearchProjectDefs/Building_Example.xml b/_Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/Defs/ResearchProjectDefs/Example_5_RPD_Crypto.xml
similarity index 85%
rename from _Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/Defs/ResearchProjectDefs/Building_Example.xml
rename to _Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/Defs/ResearchProjectDefs/Example_5_RPD_Crypto.xml
index 87c6b73..1dfb64c 100644
--- a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Research - Example 1 - Locking and Unlocking Buildings/Defs/ResearchProjectDefs/Building_Example.xml	
+++ b/_Mod/Modders Resource/Examples/Example 5 - Ancient Crytosleep/Defs/ResearchProjectDefs/Example_5_RPD_Crypto.xml	
@@ -2,11 +2,11 @@
 <Defs>
 
     <ResearchProjectDef>
-        <defName>AncientTechnology</defName>
+        <defName>Example_5_AncientTechnology</defName>
         <label>Ancient Technology</label>
         <description>This will unlock the secrets of ancient technologies which have been lost though time.</description>
         <descriptionDiscovered>"What has been will be again, what has been done will be done again; there is nothing new under the sun." Ecclesiastes 1:9</descriptionDiscovered>
-        <baseCost>1</baseCost>
+        <baseCost>1500</baseCost>
         <techLevel>Industrial</techLevel>
         <prerequisites/>
     </ResearchProjectDef>
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Recipe Example/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/AdvancedResearchDefs/Recipe_Example.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/Defs/AdvancedResearchDefs/Recipe_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/AdvancedResearchDefs/Recipe_Example.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/Defs/AdvancedResearchDefs/Recipe_Example.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ModHelperDefs/Recipe_Example.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/Defs/ModHelperDefs/Recipe_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ModHelperDefs/Recipe_Example.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/Defs/ModHelperDefs/Recipe_Example.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/RecipeDefs/Recipe_Example.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/Defs/RecipeDefs/Recipe_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/RecipeDefs/Recipe_Example.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/Defs/RecipeDefs/Recipe_Example.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ResearchProjectDefs/Recipe_Example.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/Defs/ResearchProjectDefs/Recipe_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ResearchProjectDefs/Recipe_Example.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/Defs/ResearchProjectDefs/Recipe_Example.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ThingDefs/Recipe_Example.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/Defs/ThingDefs/Recipe_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ThingDefs/Recipe_Example.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Recipe Example/Defs/ThingDefs/Recipe_Example.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Research Project Example/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Exclusive.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Exclusive.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Exclusive.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Exclusive.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Inclusive.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Inclusive.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Inclusive.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Inclusive.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ModHelperDefs/Research_Project_Example.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/Defs/ModHelperDefs/Research_Project_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ModHelperDefs/Research_Project_Example.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/Defs/ModHelperDefs/Research_Project_Example.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Exclusive.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Exclusive.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Exclusive.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Exclusive.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Inclusive.xml b/_Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Inclusive.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Inclusive.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Inclusive.xml
diff --git a/_Mod/Modders Resource/Examples/Backstories/BackstoryDef Example/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/Backstories/BackstoryDef Example/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Backstories/BackstoryDef Example/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Backstories/BackstoryDef Example/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/Backstories/BackstoryDef Example/Defs/BackstoryDefs/BackstoryDef.xml b/_Mod/Modders Resource/Examples/Old Examples/Backstories/BackstoryDef Example/Defs/BackstoryDefs/BackstoryDef.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Backstories/BackstoryDef Example/Defs/BackstoryDefs/BackstoryDef.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Backstories/BackstoryDef Example/Defs/BackstoryDefs/BackstoryDef.xml
diff --git a/_Mod/Modders Resource/Examples/Backstories/NameDef Example/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/Backstories/NameDef Example/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Backstories/NameDef Example/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Backstories/NameDef Example/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/Backstories/NameDef Example/Defs/NameDefs/NameDefTemplate.xml b/_Mod/Modders Resource/Examples/Old Examples/Backstories/NameDef Example/Defs/NameDefs/NameDefTemplate.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Backstories/NameDef Example/Defs/NameDefs/NameDefTemplate.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Backstories/NameDef Example/Defs/NameDefs/NameDefTemplate.xml
diff --git a/_Mod/Modders Resource/Examples/Backstories/PawnBio Example/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/Backstories/PawnBio Example/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Backstories/PawnBio Example/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Backstories/PawnBio Example/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/Backstories/PawnBio Example/Defs/BackstoryDefs/BackstoryDef.xml b/_Mod/Modders Resource/Examples/Old Examples/Backstories/PawnBio Example/Defs/BackstoryDefs/BackstoryDef.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Backstories/PawnBio Example/Defs/BackstoryDefs/BackstoryDef.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Backstories/PawnBio Example/Defs/BackstoryDefs/BackstoryDef.xml
diff --git a/_Mod/Modders Resource/Examples/Backstories/PawnBio Example/Defs/PawnBioDefs/PawnBioDef.xml b/_Mod/Modders Resource/Examples/Old Examples/Backstories/PawnBio Example/Defs/PawnBioDefs/PawnBioDef.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Backstories/PawnBio Example/Defs/PawnBioDefs/PawnBioDef.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Backstories/PawnBio Example/Defs/PawnBioDefs/PawnBioDef.xml
diff --git a/_Mod/Modders Resource/Examples/ModHelpers/Facility Injector/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/ModHelpers/Facility Injector/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ModHelpers/Facility Injector/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ModHelpers/Facility Injector/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/ModHelpers/Facility Injector/Defs/ModHelperDefs/Facility_Injector.xml b/_Mod/Modders Resource/Examples/Old Examples/ModHelpers/Facility Injector/Defs/ModHelperDefs/Facility_Injector.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ModHelpers/Facility Injector/Defs/ModHelperDefs/Facility_Injector.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ModHelpers/Facility Injector/Defs/ModHelperDefs/Facility_Injector.xml
diff --git a/_Mod/Modders Resource/Examples/ModHelpers/ThingComp Injection/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/ModHelpers/ThingComp Injection/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ModHelpers/ThingComp Injection/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ModHelpers/ThingComp Injection/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/ModHelpers/ThingComp Injection/Defs/ModHelperDefs/ModHelper.xml b/_Mod/Modders Resource/Examples/Old Examples/ModHelpers/ThingComp Injection/Defs/ModHelperDefs/ModHelper.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ModHelpers/ThingComp Injection/Defs/ModHelperDefs/ModHelper.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ModHelpers/ThingComp Injection/Defs/ModHelperDefs/ModHelper.xml
diff --git a/_Mod/Modders Resource/Examples/ModHelpers/Trader Injector/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/ModHelpers/Trader Injector/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ModHelpers/Trader Injector/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ModHelpers/Trader Injector/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/ModHelpers/Trader Injector/Defs/ModHelperDefs/Trader_Injector.xml b/_Mod/Modders Resource/Examples/Old Examples/ModHelpers/Trader Injector/Defs/ModHelperDefs/Trader_Injector.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ModHelpers/Trader Injector/Defs/ModHelperDefs/Trader_Injector.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ModHelpers/Trader Injector/Defs/ModHelperDefs/Trader_Injector.xml
diff --git a/_Mod/Modders Resource/Examples/Outfits/OutfitDef Example/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/Outfits/OutfitDef Example/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Outfits/OutfitDef Example/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Outfits/OutfitDef Example/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/Outfits/OutfitDef Example/Defs/OutfitDefs/OutfitDef.xml b/_Mod/Modders Resource/Examples/Old Examples/Outfits/OutfitDef Example/Defs/OutfitDefs/OutfitDef.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Outfits/OutfitDef Example/Defs/OutfitDefs/OutfitDef.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Outfits/OutfitDef Example/Defs/OutfitDefs/OutfitDef.xml
diff --git a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/PlaceWorkers/PlaceWorker_Restrictions/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/PlaceWorkers/PlaceWorker_Restrictions/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ModHelperDefs/PlaceWorker_Restrictions_Example.xml b/_Mod/Modders Resource/Examples/Old Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ModHelperDefs/PlaceWorker_Restrictions_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ModHelperDefs/PlaceWorker_Restrictions_Example.xml
rename to _Mod/Modders Resource/Examples/Old Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ModHelperDefs/PlaceWorker_Restrictions_Example.xml
diff --git a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/TerrainDefs/PlaceWorker_Restrictions_Example.xml b/_Mod/Modders Resource/Examples/Old Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/TerrainDefs/PlaceWorker_Restrictions_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/TerrainDefs/PlaceWorker_Restrictions_Example.xml
rename to _Mod/Modders Resource/Examples/Old Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/TerrainDefs/PlaceWorker_Restrictions_Example.xml
diff --git a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ThingDefs/PlaceWorker_Restrictions_Example.xml b/_Mod/Modders Resource/Examples/Old Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ThingDefs/PlaceWorker_Restrictions_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ThingDefs/PlaceWorker_Restrictions_Example.xml
rename to _Mod/Modders Resource/Examples/Old Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ThingDefs/PlaceWorker_Restrictions_Example.xml
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/AdvancedResearchDefs/ARD_Automated_Stonecutter.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/AdvancedResearchDefs/ARD_Automated_Stonecutter.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/AdvancedResearchDefs/ARD_Automated_Stonecutter.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/AdvancedResearchDefs/ARD_Automated_Stonecutter.xml
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/ModHelperDefs/MHD_Automated_Stonecutter.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/ModHelperDefs/MHD_Automated_Stonecutter.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/ModHelperDefs/MHD_Automated_Stonecutter.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/ModHelperDefs/MHD_Automated_Stonecutter.xml
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/RecipeDefs/RD_Automated_Stonecutter.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/RecipeDefs/RD_Automated_Stonecutter.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/RecipeDefs/RD_Automated_Stonecutter.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/RecipeDefs/RD_Automated_Stonecutter.xml
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/ThingDefs/TD_Automated_Stonecutter.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/ThingDefs/TD_Automated_Stonecutter.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/ThingDefs/TD_Automated_Stonecutter.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingClasses/Building_AutomatedFactory/Automated Stonecutter/Defs/ThingDefs/TD_Automated_Stonecutter.xml
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Hidden Equipment Rack/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingComps/Hidden Equipment Rack/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingComps/Hidden Equipment Rack/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingComps/Hidden Equipment Rack/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Hidden Equipment Rack/Defs/ModHelperDefs/Hidden_Equipment_Rack.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingComps/Hidden Equipment Rack/Defs/ModHelperDefs/Hidden_Equipment_Rack.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingComps/Hidden Equipment Rack/Defs/ModHelperDefs/Hidden_Equipment_Rack.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingComps/Hidden Equipment Rack/Defs/ModHelperDefs/Hidden_Equipment_Rack.xml
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Hidden Equipment Rack/Defs/ThingDefs/Hidden_Equipment_Rack.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingComps/Hidden Equipment Rack/Defs/ThingDefs/Hidden_Equipment_Rack.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingComps/Hidden Equipment Rack/Defs/ThingDefs/Hidden_Equipment_Rack.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingComps/Hidden Equipment Rack/Defs/ThingDefs/Hidden_Equipment_Rack.xml
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Milkable Boomalope/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingComps/Milkable Boomalope/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingComps/Milkable Boomalope/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingComps/Milkable Boomalope/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Milkable Boomalope/Defs/ModHelperDefs/Milkable_Boomalope.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingComps/Milkable Boomalope/Defs/ModHelperDefs/Milkable_Boomalope.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingComps/Milkable Boomalope/Defs/ModHelperDefs/Milkable_Boomalope.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingComps/Milkable Boomalope/Defs/ModHelperDefs/Milkable_Boomalope.xml
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Milkable Boomalope/Defs/ThingDefs/BoomalopeGas.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingComps/Milkable Boomalope/Defs/ThingDefs/BoomalopeGas.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingComps/Milkable Boomalope/Defs/ThingDefs/BoomalopeGas.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingComps/Milkable Boomalope/Defs/ThingDefs/BoomalopeGas.xml
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Milkable Boomalope/Textures/Things/Item/Special/BoomalopeGas.png b/_Mod/Modders Resource/Examples/Old Examples/ThingComps/Milkable Boomalope/Textures/Things/Item/Special/BoomalopeGas.png
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingComps/Milkable Boomalope/Textures/Things/Item/Special/BoomalopeGas.png
rename to _Mod/Modders Resource/Examples/Old Examples/ThingComps/Milkable Boomalope/Textures/Things/Item/Special/BoomalopeGas.png
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingComps/Refrigerated Meal Shelf/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingComps/Refrigerated Meal Shelf/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ModHelperDefs/Refrigerated_Meal_Shelf.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingComps/Refrigerated Meal Shelf/Defs/ModHelperDefs/Refrigerated_Meal_Shelf.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ModHelperDefs/Refrigerated_Meal_Shelf.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingComps/Refrigerated Meal Shelf/Defs/ModHelperDefs/Refrigerated_Meal_Shelf.xml
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ThingDefs/Refrigerated_Meal_Shelf.xml b/_Mod/Modders Resource/Examples/Old Examples/ThingComps/Refrigerated Meal Shelf/Defs/ThingDefs/Refrigerated_Meal_Shelf.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ThingDefs/Refrigerated_Meal_Shelf.xml
rename to _Mod/Modders Resource/Examples/Old Examples/ThingComps/Refrigerated Meal Shelf/Defs/ThingDefs/Refrigerated_Meal_Shelf.xml
diff --git a/_Mod/Modders Resource/Examples/Verbs/Shotgun Example/About/About.xml b/_Mod/Modders Resource/Examples/Old Examples/Verbs/Shotgun Example/About/About.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Verbs/Shotgun Example/About/About.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Verbs/Shotgun Example/About/About.xml
diff --git a/_Mod/Modders Resource/Examples/Verbs/Shotgun Example/Defs/ThingDefs/Shotgun.xml b/_Mod/Modders Resource/Examples/Old Examples/Verbs/Shotgun Example/Defs/ThingDefs/Shotgun.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Verbs/Shotgun Example/Defs/ThingDefs/Shotgun.xml
rename to _Mod/Modders Resource/Examples/Old Examples/Verbs/Shotgun Example/Defs/ThingDefs/Shotgun.xml
diff --git a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/About/About.xml b/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/About/About.xml
deleted file mode 100644
index aa5878f..0000000
--- a/_Mod/Modders Resource/Examples/ThingClasses/Building_AutomatedFactory/Building Automated Factory - Example 2 - Food & Drug Synthesizer/About/About.xml	
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ModMetaData>
-    <name>Building Automated Factory - Example 1 - Food &amp; Drug Synthesizer</name>
-    <author>RimWorld CCL Team</author>
-    <url>n/a</url>
-    <targetVersion>0.15.1284</targetVersion>
-    <description>
-This is an example of a food and drug synthesizer.
-
-Demonstrates:
-	AdvancedRecipeDef
-	AdvancedResearchDef
-	Building_AutomatedFactory
-	CompAutomatedFactory
-	CompHopperUser
-	CompProperties_AffectedByFacilities
-	CompProperties_AutomatedFactory
-	IHopperUser (Building_AutomatedFactory)
-	ITab_AutomatedFactory
-	ModHelperDef
-	PlaceWorker_HopperMagnifier
-	SequencedInjectionSet_ThingDefAvailability
-	SequencedInjectionSet_Facility
-</description>
-
-</ModMetaData>
\ No newline at end of file