diff --git a/CommunityCoreLibrary.sln b/CommunityCoreLibrary.sln
index 6f43ede..3edfcec 100644
--- a/CommunityCoreLibrary.sln
+++ b/CommunityCoreLibrary.sln
@@ -214,8 +214,8 @@ Global
 		$30.inheritsSet = VisualStudio
 		$30.inheritsScope = text/plain
 		$30.scope = text/plain
-		description = RimWorld Alpha 11 Community Core Library
-		version = 0.11.5
+		description = RimWorld Alpha 12 Community Core Library
+		version = 0.12.0
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/DLL_Project/CommunityCoreLibrary.csproj b/DLL_Project/CommunityCoreLibrary.csproj
index 32e6e7d..6b7ce42 100644
--- a/DLL_Project/CommunityCoreLibrary.csproj
+++ b/DLL_Project/CommunityCoreLibrary.csproj
@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
-    <ReleaseVersion>0.11.5</ReleaseVersion>
+    <ReleaseVersion>0.12.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -47,6 +47,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Defs\MainTab_HelpMenuDef.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PlaceWorkers\PlaceWorker_OnlyUnderRoof.cs" />
     <Compile Include="PlaceWorkers\PlaceWorker_WallAttachment.cs" />
@@ -76,10 +77,8 @@
     <Compile Include="Alerts\Alert_NeedBatteries.cs" />
     <Compile Include="Defs\HelpCategoryDef.cs" />
     <Compile Include="Defs\HelpDef.cs" />
-    <Compile Include="OTabs\OTab_ModHelp.cs" />
-    <Compile Include="Defs\CCLVersionDef.cs" />
+    <Compile Include="MainTabs\MainTabWindow_ModHelp.cs" />
     <Compile Include="ITabs\ModInit.cs" />
-    <Compile Include="MonoBehaviour\Controller.cs" />
     <Compile Include="Commands\ChangeColor.cs" />
     <Compile Include="Commands\DefOrThingCompInRoom.cs" />
     <Compile Include="Commands\TouchingByThingComp.cs" />
@@ -89,7 +88,6 @@
     <Compile Include="Enumerations\LowIdleDrawMode.cs" />
     <Compile Include="Structures\ColorName.cs" />
     <Compile Include="Structures\ResearchCompletePair.cs" />
-    <Compile Include="MapComponents\ResearchControl.cs" />
     <Compile Include="Extensions\Thing_Extensions.cs" />
     <Compile Include="Extensions\ThingComp_Extensions.cs" />
     <Compile Include="Extensions\ThingDef_Extensions.cs" />
@@ -98,6 +96,12 @@
     <Compile Include="CompProperties\RestrictedPlacement_Properties.cs" />
     <Compile Include="ThingComps\RestrictedPlacement_Comp.cs" />
     <Compile Include="ThingComps\CompHeatPusherPowered.cs" />
+    <Compile Include="MonoBehaviour\ModController.cs" />
+    <Compile Include="MapComponents\ResearchController.cs" />
+    <Compile Include="Defs\ModHelperDef.cs" />
+    <Compile Include="Structures\DesignatorData.cs" />
+    <Compile Include="Extensions\TerrainWithComps.cs" />
+    <Compile Include="Extensions\BuildableDef_Extensions.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. 
@@ -110,22 +114,5 @@
   <ItemGroup />
   <PropertyGroup>
   </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="PlaceWorkers\" />
-    <Folder Include="MapComponents\" />
-    <Folder Include="ThingComps\" />
-    <Folder Include="CompProperties\" />
-    <Folder Include="Toils\" />
-    <Folder Include="Buildings\" />
-    <Folder Include="Defs\" />
-    <Folder Include="StaticClasses\" />
-    <Folder Include="Commands\" />
-    <Folder Include="Alerts\" />
-    <Folder Include="OTabs\" />
-    <Folder Include="ITabs\" />
-    <Folder Include="MonoBehaviour\" />
-    <Folder Include="Enumerations\" />
-    <Folder Include="Structures\" />
-    <Folder Include="Extensions\" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>
\ No newline at end of file
diff --git a/DLL_Project/CompProperties/CompProperties_LowIdleDraw.cs b/DLL_Project/CompProperties/CompProperties_LowIdleDraw.cs
index 4f8a534..f294ca5 100644
--- a/DLL_Project/CompProperties/CompProperties_LowIdleDraw.cs
+++ b/DLL_Project/CompProperties/CompProperties_LowIdleDraw.cs
@@ -10,7 +10,7 @@ public class CompProperties_LowIdleDraw : CompProperties
 
         public float                        idlePowerFactor;
         public LowIdleDrawMode              operationalMode = LowIdleDrawMode.InUse;
-        public int                          cycleLowTicks = 30;
+        public int                          cycleLowTicks = -1;
         public int                          cycleHighTicks = -1;
 
         #endregion
diff --git a/DLL_Project/CompProperties/RestrictedPlacement_Properties.cs b/DLL_Project/CompProperties/RestrictedPlacement_Properties.cs
index 8f2e5b7..944461f 100644
--- a/DLL_Project/CompProperties/RestrictedPlacement_Properties.cs
+++ b/DLL_Project/CompProperties/RestrictedPlacement_Properties.cs
@@ -10,17 +10,121 @@ public class RestrictedPlacement_Properties : CompProperties
 
         #region XML Data
 
+        // Maximum count of a thing which may exist at any given time
         public int                          MaxCount = -1;
-        public List< TerrainDef >           RestrictedTerrain;
-        public List< ThingDef >             RestrictedThing;
+
+        // These only apply to terrain restrictions, use them to auto-add
+        // Rough of Smooth stone terrain to the list of Restricted Terrain
+        // without having to list each one individually
+        public bool                         IncludeRoughStone;
+        public bool                         IncludeSmoothStone;
+
+        // List of terrain to filter by
+        public List< TerrainDef >           terrainDefs;
+
+        // List of things to filter by
+        public List< ThingDef >             thingDefs;
 
         #endregion
 
+        [Unsaved]
+
+        #region Instance Data
+
+        List< TerrainDef >                  restrictedTerrain;
+        List< ThingDef >                    restrictedThing;
+
+        #endregion
+
+        #region Process State
+
         public                              RestrictedPlacement_Properties()
         {
             compClass = typeof( RestrictedPlacement_Properties );
         }
 
+        #endregion
+
+        #region Query State
+
+        public List< TerrainDef >           RestrictedTerrain
+        {
+            get
+            {
+                if( restrictedTerrain == null )
+                {
+                    // Create cache
+                    restrictedTerrain = new List< TerrainDef >();
+
+                    // Add xml defined terrain
+                    if( ( terrainDefs != null )&&
+                        ( terrainDefs.Count > 0 ) )
+                    {
+                        restrictedTerrain.AddRange( terrainDefs );
+                    }
+
+                    // Now check for auto-adds
+                    if( IncludeRoughStone )
+                    {
+                        var roughStone = DefDatabase<TerrainDef>.AllDefsListForReading
+                            .FindAll( t =>
+                                ( t.defName.Contains( "_Rough" ) )
+                            );
+                        if( ( roughStone != null )&&
+                            ( roughStone.Count > 0 ) )
+                        {
+                            restrictedTerrain.AddRange( roughStone );
+                        }
+                    }
+
+                    if( IncludeSmoothStone )
+                    {
+                        var smoothStone = DefDatabase<TerrainDef>.AllDefsListForReading
+                            .FindAll( t =>
+                                ( t.defName.Contains( "_Smooth" ) )
+                            );
+                        if( ( smoothStone != null )&&
+                            ( smoothStone.Count > 0 ) )
+                        {
+                            restrictedTerrain.AddRange( smoothStone );
+                        }
+                    }
+
+#if DEBUG
+                    if( ( restrictedTerrain == null )||
+                        ( restrictedTerrain.Count == 0 ) )
+                    {
+                        Log.Error( "Community Core Library :: Restricted Placement Properties :: Restricted terrain comp used with no terrainDefs!" );
+                    }
+#endif
+                    
+                }
+                return restrictedTerrain;
+            }
+        }
+
+        public List< ThingDef >             RestrictedThing
+        {
+            get
+            {
+                if( restrictedThing == null )
+                {
+                    // Create cache
+                    restrictedThing = new List< ThingDef >();
+
+                    // Add xml defined things
+                    if( ( thingDefs != null )&&
+                        ( thingDefs.Count > 0 ) )
+                    {
+                        restrictedThing.AddRange( thingDefs );
+                    }
+                }
+                return restrictedThing;
+            }
+        }
+
+        #endregion
+
     }
 
 }
diff --git a/DLL_Project/Defs/AdvancedResearchDef.cs b/DLL_Project/Defs/AdvancedResearchDef.cs
index 8c51101..e65ede6 100644
--- a/DLL_Project/Defs/AdvancedResearchDef.cs
+++ b/DLL_Project/Defs/AdvancedResearchDef.cs
@@ -21,98 +21,268 @@ public class AdvancedResearchDef : Def
         // Research requirement
         public List< ResearchProjectDef >   researchDefs;
 
+
         // These are optionally defined in xml
         public List< RecipeDef >            recipeDefs;
         public List< string >               sowTags;
         public List< ThingDef >             thingDefs;
         public List< ResearchProjectDef >   effectedResearchDefs;
-        public List< ResearchMod >          researchMods;
+        public List< AdvancedResearchMod >  researchMods;
 
         #endregion
 
-        #region Instance Data
         [Unsaved]
 
-        public bool                         isEnabled;
+        #region Instance Data
+
+        bool                                isEnabled;
 
         #endregion
 
         #region Query State
 
-        public bool                         ResearchComplete()
+        public bool                         IsValid
         {
-            // God mode, allow it
-            if( Game.GodMode )
+            get
             {
-                return true;
+                // Hopefully...
+                var isValid = true;
+
+#if DEBUG
+                // Validate recipes
+                if( IsRecipeToggle )
+                {
+                    // Make sure thingDefs are of the appropriate type (has ITab_Bills)
+                    foreach( var thingDef in thingDefs )
+                    {
+                        if( thingDef.thingClass.GetInterface( "IBillGiver" ) == null )
+                        {
+                            // Invalid project
+                            isValid = false;
+                            Log.Error( "Community Core Library :: Advanced Research :: thingDef( " + thingDef.defName + " ) is of inappropriate type in AdvancedResearchDef( " + defName + " ) - Must implement \"IBillGiver\"" );
+                        }
+                    }
+
+                }
+
+                // Validate plant sowTags
+                if( IsPlantToggle )
+                {
+                    // Make sure things are of the appropriate class (Plant)
+                    foreach( var thingDef in thingDefs )
+                    {
+                        if( thingDef.thingClass != typeof( Plant ) )
+                        {
+                            // Invalid project
+                            isValid = false;
+                            Log.Error( "Community Core Library :: Advanced Research :: thingDef( " + thingDef.defName + " ) is of inappropriate type in AdvancedResearchDef( " + defName + " ) - Must be <thingClass> \"Plant\"" );
+                        }
+                    }
+
+                    // Make sure sowTags are valid (!null or empty)
+                    for( int i = 0; i < sowTags.Count; i++ )
+                    {
+                        var sowTag = sowTags[ i ];
+                        if( string.IsNullOrEmpty( sowTag ) )
+                        {
+                            Log.Error( "Community Core Library :: Advanced Research :: sowTags( index = " + i + " ) resolved to null in AdvancedResearchDef( " + defName + " )" );
+                        }
+                    }
+                }
+
+                // Validate buildings
+                if( IsBuildingToggle )
+                {
+                    // Make sure thingDefs are of the appropriate type (has proper designationCategory)
+                    foreach( var thingDef in thingDefs )
+                    {
+                        if( ( string.IsNullOrEmpty( thingDef.designationCategory ) )||
+                            ( thingDef.designationCategory.ToLower() == "none" ) )
+                        {
+                            // Invalid project
+                            isValid = false;
+                            Log.Error( "Community Core Library :: Advanced Research :: thingDef( " + thingDef.defName + " ) is of inappropriate type in AdvancedResearchDef( " + defName + " ) - <designationCategory> must not be null or \"None\"" );
+                        }
+                    }
+                }
+#endif
+                return isValid;
             }
+        }
 
-            // No god mode, check it
-            foreach( var researchProject in researchDefs )
+        public bool                         CanEnable
+        {
+            get
             {
-                if( !researchProject.IsFinished )
+                // God mode, allow it
+                if( ( Game.GodMode )&&
+                    ( !isEnabled ) )
+                {
+                    return true;
+                }
+
+                if( isEnabled )
                 {
+                    // Already on
                     return false;
                 }
-            }
 
-            // All done
-            return true;
+                // Check individual research projects
+                foreach( var researchProject in researchDefs )
+                {
+                    if( !researchProject.IsFinished )
+                    {
+                        return false;
+                    }
+                }
+
+                // All required research complete
+                return true;
+            }
         }
 
-        public bool                         IsRecipeToggle()
+        public bool                         IsRecipeToggle
         {
-            // Determine if this def toggles recipes
-            return (
-                ( ( recipeDefs != null )&&( recipeDefs.Count > 0 ) )&&
-                ( ( sowTags == null )||( ( sowTags != null )&&( sowTags.Count == 0 ) ) )&&
-                ( ( thingDefs != null )&&( thingDefs.Count > 0 ) )
-            );
+            get
+            {
+                // Determine if this def toggles recipes
+                return (
+                    ( ( recipeDefs != null )&&( recipeDefs.Count > 0 ) )&&
+                    ( ( sowTags == null )||( ( sowTags != null )&&( sowTags.Count == 0 ) ) )&&
+                    ( ( thingDefs != null )&&( thingDefs.Count > 0 ) )
+                );
+            }
         }
 
-        public bool                         IsPlantToggle()
+        public bool                         IsPlantToggle
         {
-            // Determine if this def toggles plant sow tags
-            return (
-                ( ( recipeDefs == null )||( ( recipeDefs != null )&&( recipeDefs.Count == 0 ) ) )&&
-                ( ( sowTags != null )&&( sowTags.Count > 0 ) )&&
-                ( ( thingDefs != null )&&( thingDefs.Count > 0 ) )
-            );
+            get
+            {
+                // Determine if this def toggles plant sow tags
+                return (
+                    ( ( recipeDefs == null )||( ( recipeDefs != null )&&( recipeDefs.Count == 0 ) ) )&&
+                    ( ( sowTags != null )&&( sowTags.Count > 0 ) )&&
+                    ( ( thingDefs != null )&&( thingDefs.Count > 0 ) )
+                );
+            }
         }
 
-        public bool                         IsBuildingToggle()
+        public bool                         IsBuildingToggle
         {
-            // Determine if this def toggles buildings
-            return (
-                ( ( recipeDefs == null )||( ( recipeDefs != null )&&( recipeDefs.Count == 0 ) ) )&&
-                ( ( sowTags == null )||( ( sowTags != null )&&( sowTags.Count == 0 ) ) )&&
-                ( ( thingDefs != null )&&( thingDefs.Count > 0 ) )
-            );
+            get
+            {
+                // Determine if this def toggles buildings
+                return (
+                    ( ( recipeDefs == null )||( ( recipeDefs != null )&&( recipeDefs.Count == 0 ) ) )&&
+                    ( ( sowTags == null )||( ( sowTags != null )&&( sowTags.Count == 0 ) ) )&&
+                    ( ( thingDefs != null )&&( thingDefs.Count > 0 ) )
+                );
+            }
         }
 
-        public bool                         HasCallbacks()
+        public bool                         IsResearchToggle
         {
-            // Determine if this def has callbacks
-            return (
-                ( ( researchMods != null )&&( researchMods.Count > 0 ) )
-            );
+            get
+            {
+                // Determine if this def toggles research
+                return (
+                    ( ( effectedResearchDefs != null )&&( effectedResearchDefs.Count > 0 ) )
+                );
+            }
         }
 
-        public bool                         IsResearchToggle()
+        public bool                         HasCallbacks
         {
-            // Determine if this def toggles research
-            return (
-                ( ( effectedResearchDefs != null )&&( effectedResearchDefs.Count > 0 ) )
-            );
+            get
+            {
+                // Determine if this def has callbacks
+                return (
+                    ( ( researchMods != null )&&( researchMods.Count > 0 ) )
+                );
+            }
         }
 
         #endregion
 
         #region Process State
 
-        public void                         ToggleRecipes( List< ThingDef > buildingCache, bool SetInitialState = false )
+        public void                         Disable( bool firstTimeRun = false )
+        {
+            // Don't unset if not set
+            if( ( !isEnabled )&&
+                ( firstTimeRun = false ) )
+            {
+                return;
+            }
+            if( IsRecipeToggle )
+            {
+                // Recipe toggle
+                ToggleRecipes( true );
+            }
+            if( IsPlantToggle )
+            {
+                // Plant toggle
+                TogglePlants( true );
+            }
+            if( IsBuildingToggle )
+            {
+                // Building toggle
+                ToggleBuildings( true );
+            }
+            if( IsResearchToggle )
+            {
+                // Research toggle
+                ToggleResearch( true );
+            }
+            if( ( HasCallbacks )&&
+                ( !firstTimeRun ) )
+            {
+                // Cache callbacks
+                ToggleCallbacks( true );
+            }
+            // Flag it as disabled
+            isEnabled = false;
+        }
+
+        public void                         Enable()
+        {
+            // Don't set if set
+            if( isEnabled )
+            {
+                return;
+            }
+            if( IsRecipeToggle )
+            {
+                // Recipe toggle
+                ToggleRecipes();
+            }
+            if( IsPlantToggle )
+            {
+                // Plant toggle
+                TogglePlants();
+            }
+            if( IsBuildingToggle )
+            {
+                // Building toggle
+                ToggleBuildings();
+            }
+            if( IsResearchToggle )
+            {
+                // Research toggle
+                ToggleResearch();
+            }
+            if( HasCallbacks )
+            {
+                // Cache callbacks
+                ToggleCallbacks();
+            }
+            // Flag it as enabled
+            isEnabled = true;
+        }
+
+        void                                ToggleRecipes( bool setInitialState = false )
         {
-            bool Hide = !SetInitialState ? HideDefs : !HideDefs;
+            bool Hide = !setInitialState ? HideDefs : !HideDefs;
 
             // Go through each building
             foreach( var buildingDef in thingDefs )
@@ -145,22 +315,6 @@ public void                         ToggleRecipes( List< ThingDef > buildingCach
                             buildingDef.recipes.Remove( recipeDef );
                         }
 
-                        // Remove bill on any table of this def using this recipe
-                        var buildings = Find.ListerBuildings.AllBuildingsColonistOfDef( buildingDef );
-                        foreach( var building in buildings )
-                        {
-                            var BillGiver = building as IBillGiver;
-                            for( int i = 0; i < BillGiver.BillStack.Count; ++ i )
-                            {
-                                var bill = BillGiver.BillStack[ i ];
-                                if( bill.recipe == recipeDef )
-                                {
-                                    BillGiver.BillStack.Delete( bill );
-                                    continue;
-                                }
-                            }
-                        }
-
                     }
                     else
                     {
@@ -170,13 +324,13 @@ public void                         ToggleRecipes( List< ThingDef > buildingCach
                 }
 
                 // Add this building to the list to recache
-                buildingCache.Add( buildingDef );
+                ResearchController.buildingCache.Add( buildingDef );
             }
         }
 
-        public void                         TogglePlants( bool SetInitialState = false )
+        void                                TogglePlants( bool setInitialState = false )
         {
-            bool Hide = !SetInitialState ? HideDefs : !HideDefs;
+            bool Hide = !setInitialState ? HideDefs : !HideDefs;
 
             // Go through each plant
             foreach( var plantDef in thingDefs )
@@ -206,9 +360,9 @@ public void                         TogglePlants( bool SetInitialState = false )
             }
         }
 
-        public void                         ToggleBuildings( bool SetInitialState = false )
+        void                                ToggleBuildings( bool setInitialState = false )
         {
-            bool Hide = !SetInitialState ? HideDefs : !HideDefs;
+            bool Hide = !setInitialState ? HideDefs : !HideDefs;
 
             // Go through each building
             foreach( var buildingDef in thingDefs )
@@ -217,9 +371,9 @@ public void                         ToggleBuildings( bool SetInitialState = fals
             }
         }
 
-        public void                         ToggleResearch( bool SetInitialState = false )
+        void                                ToggleResearch( bool setInitialState = false )
         {
-            bool Hide = !SetInitialState ? HideDefs : !HideDefs;
+            bool Hide = !setInitialState ? HideDefs : !HideDefs;
 
             // Go through each research project to be effected
             foreach( var researchProject in effectedResearchDefs )
@@ -236,6 +390,31 @@ public void                         ToggleResearch( bool SetInitialState = false
             }
         }
 
+        void                                ToggleCallbacks( bool setInitialState = false )
+        {
+            bool Hide = !setInitialState ? HideDefs : !HideDefs;
+
+            if( Hide )
+            {
+                // Cache the callbacks in reverse order when hiding
+                for( int i = researchMods.Count - 1; i >= 0; i-- ){
+                    var researchMod = researchMods[ i ];
+                    // Add the advanced research mod to the cache
+                    ResearchController.researchModCache.Add( researchMod );
+                }
+            }
+            else
+            {
+            // Cache the callbacks in order
+                foreach( var researchMod in researchMods )
+                {
+
+                    // Add the advanced research mod to the cache
+                    ResearchController.researchModCache.Add( researchMod );
+                }
+            }
+        }
+
         #endregion
 
     }
diff --git a/DLL_Project/Defs/CCLVersionDef.cs b/DLL_Project/Defs/CCLVersionDef.cs
deleted file mode 100644
index ffcdbf4..0000000
--- a/DLL_Project/Defs/CCLVersionDef.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Verse;
-
-namespace CommunityCoreLibrary
-{
-
-    public class CCLVersionDef : Def
-    {
-
-        #region XML Data
-
-        public string                       ModName;
-
-        public string                       version;
-
-        #endregion
-
-    }
-
-}
-
diff --git a/DLL_Project/Defs/HelpCategoryDef.cs b/DLL_Project/Defs/HelpCategoryDef.cs
index ef327ac..75cb445 100644
--- a/DLL_Project/Defs/HelpCategoryDef.cs
+++ b/DLL_Project/Defs/HelpCategoryDef.cs
@@ -15,9 +15,10 @@ public class HelpCategoryDef : Def
 
         #endregion
 
-        #region Instance Data
         [Unsaved]
 
+        #region Instance Data
+
         readonly List<HelpDef>              _cachedHelpDefs = new List<HelpDef>();
 
         #endregion
@@ -38,11 +39,11 @@ public float                        DrawHeight
             {
                 if( Expanded )
                 {
-                    return OTab_ModHelp.EntryHeight + HelpDefs.Count * OTab_ModHelp.EntryHeight;
+                    return MainTabWindow_ModHelp.EntryHeight + HelpDefs.Count * MainTabWindow_ModHelp.EntryHeight;
                 }
                 else
                 {
-                    return OTab_ModHelp.EntryHeight;
+                    return MainTabWindow_ModHelp.EntryHeight;
                 }
             }
         }
@@ -79,7 +80,7 @@ public override void                PostLoad()
         }
 #endif
 
-        void                                Recache()
+        public void                         Recache()
         {
             _cachedHelpDefs.Clear();
             foreach( var def in (
diff --git a/DLL_Project/Defs/HelpDef.cs b/DLL_Project/Defs/HelpDef.cs
index c30a38f..10279ed 100644
--- a/DLL_Project/Defs/HelpDef.cs
+++ b/DLL_Project/Defs/HelpDef.cs
@@ -14,8 +14,11 @@ public class HelpDef : Def, IComparable
 
         #endregion
 
+        //[Unsaved]
+
         #region Process State
 
+#if DEBUG
         public override void                ResolveReferences()
         {
             base.ResolveReferences();
@@ -24,6 +27,7 @@ public override void                ResolveReferences()
                 Log.Error( "Community Core Library :: Help Tab :: category resolved to null in HelpDef( " + defName + " )" );
             }
         }
+#endif
 
         public int                          CompareTo( object obj )
         {
diff --git a/DLL_Project/Defs/MainTab_HelpMenuDef.cs b/DLL_Project/Defs/MainTab_HelpMenuDef.cs
new file mode 100644
index 0000000..8ec541f
--- /dev/null
+++ b/DLL_Project/Defs/MainTab_HelpMenuDef.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using RimWorld;
+using UnityEngine;
+
+namespace CommunityCoreLibrary
+{
+    public class MainTab_HelpMenuDef : MainTabDef
+    {
+        public Vector2 windowSize = new Vector2(MainTabWindow_ModHelp.MinWidth, MainTabWindow_ModHelp.MinHeight);
+        public float listWidth = MainTabWindow_ModHelp.MinListWidth;
+        public bool pauseGame = false;
+    }
+}
diff --git a/DLL_Project/Defs/ModHelperDef.cs b/DLL_Project/Defs/ModHelperDef.cs
new file mode 100644
index 0000000..4818d78
--- /dev/null
+++ b/DLL_Project/Defs/ModHelperDef.cs
@@ -0,0 +1,188 @@
+using System;
+using System.Collections.Generic;
+
+using RimWorld;
+using Verse;
+
+namespace CommunityCoreLibrary
+{
+
+    public class ModHelperDef : Def
+    {
+
+        #region XML Data
+
+        public string                       ModName;
+
+        public string                       version;
+
+        public List< string >               MapComponents;
+
+        public List< DesignatorData >       Designators;
+
+        #endregion
+
+        //[Unsaved]
+
+        #region Instance Data
+
+        #endregion
+
+        #region Query State
+
+        public bool                         IsValid
+        {
+            get
+            {
+                var isValid = true;
+                var errors = "Community Core Library :: Mod Dependency :: " + ModName;
+
+                var modVersion = new Version( version );
+
+                if( modVersion > ModController.CCLVersion )
+                {
+                    errors += "\n\tVersion requirement: v" + modVersion;
+                    isValid = false;
+                }
+
+#if DEBUG
+                if( ( MapComponents != null )&&
+                    ( MapComponents.Count > 0 ) )
+                {
+                    foreach( var component in MapComponents )
+                    {
+                        var componentType = Type.GetType( component );
+                        if( ( componentType == null )||
+                            ( componentType.BaseType != typeof( MapComponent ) ) )
+                        {
+                            errors += "\n\tUnable to resolve MapComponent \"" + component + "\"";
+                            isValid = false;
+                        }
+                    }
+                }
+
+                if( ( Designators != null )&&
+                    ( Designators.Count > 0 ) )
+                {
+                    foreach( var data in Designators )
+                    {
+                        var designatorType = Type.GetType( data.designatorClass );
+                        if( ( designatorType == null )||
+                            ( designatorType.BaseType != typeof( Designator ) ) )
+                        {
+                            errors += "\n\tUnable to resolve designatorClass \"" + data.designatorClass + "\"";
+                            isValid = false;
+                        }
+                        if( DefDatabase< DesignationCategoryDef >.GetNamed( data.designationCategoryDef, false ) == null )
+                        {
+                            errors += "\n\tUnable to resolve designationCategoryDef \"" + data.designationCategoryDef + "\"";
+                            isValid = false;
+                        }
+                    }
+                }
+#endif
+                
+                if( !isValid )
+                {
+                    Log.Error( errors );
+                }
+
+                return isValid;
+            }
+        }
+
+        public bool                         MapComponentsInjected
+        {
+            get
+            {
+                if( ( MapComponents == null )||
+                    ( MapComponents.Count == 0 ) )
+                {
+                    return true;
+                }
+
+                var colonyMapComponents = Find.Map.components;
+
+                foreach( var mapComponent in MapComponents )
+                {
+                    var mapComponentType = Type.GetType( mapComponent );
+                    if( !colonyMapComponents.Exists( c => c.GetType() == mapComponentType ) )
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+        }
+
+        public bool                         DesignatorsInjected
+        {
+            get
+            {
+                if( ( Designators == null )||
+                    ( Designators.Count == 0 ) )
+                {
+                    return true;
+                }
+                foreach( var data in Designators )
+                {
+                    var designatorType = Type.GetType( data.designatorClass );
+                    var designatorCategoryDef = DefDatabase< DesignationCategoryDef >.GetNamed( data.designationCategoryDef, false );
+                    if( !designatorCategoryDef.resolvedDesignators.Exists( d => d.GetType() == designatorType ) )
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+        }
+
+        #endregion
+
+        #region Injection
+
+        public void                         InjectMapComponents()
+        {
+            var colonyMapComponents = Find.Map.components;
+
+            foreach( var mapComponent in MapComponents )
+            {
+                // Get the component type
+                var mapComponentType = Type.GetType( mapComponent );
+
+                // Does it exist in the map?
+                if( !colonyMapComponents.Exists( c => c.GetType() == mapComponentType ) )
+                {
+                    // Create the new map component
+                    var mapComponentObject = (MapComponent) Activator.CreateInstance( mapComponentType );
+
+                    // Inject the component
+                    colonyMapComponents.Add( mapComponentObject );
+                }
+            }
+        }
+
+        public void                         InjectDesignators()
+        {
+            foreach( var data in Designators )
+            {
+                var designatorType = Type.GetType( data.designatorClass );
+                var designatorCategoryDef = DefDatabase< DesignationCategoryDef >.GetNamed( data.designationCategoryDef, false );
+                if( !designatorCategoryDef.resolvedDesignators.Exists( d => d.GetType() == designatorType ) )
+                {
+                    // Create the new designator
+                    var designatorObject = (Designator) Activator.CreateInstance( designatorType );
+
+                    // Inject the designator
+                    designatorCategoryDef.resolvedDesignators.Add( designatorObject );
+                }
+            }
+        }
+
+        #endregion
+
+    }
+
+}
diff --git a/DLL_Project/Extensions/BuildableDef_Extensions.cs b/DLL_Project/Extensions/BuildableDef_Extensions.cs
new file mode 100644
index 0000000..dd60d58
--- /dev/null
+++ b/DLL_Project/Extensions/BuildableDef_Extensions.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+
+using Verse;
+
+namespace CommunityCoreLibrary
+{
+
+    public static class BuildableDef_Extensions
+    {
+        
+        #region Comp Properties
+
+        public static CommunityCoreLibrary.RestrictedPlacement_Properties RestrictedPlacement_Properties ( this BuildableDef buildableDef )
+        {
+            if( buildableDef.GetType() == typeof( TerrainWithComps ) )
+            {
+                // Terrain with comps
+                return ( (TerrainWithComps)buildableDef ).GetCompProperties( typeof( RestrictedPlacement_Comp ) ) as RestrictedPlacement_Properties;
+            }
+            else if ( buildableDef.GetType() == typeof( ThingDef ) )
+            {
+                // Thing with comps
+                return ( (ThingDef)buildableDef ).GetCompProperties( typeof( RestrictedPlacement_Comp ) ) as RestrictedPlacement_Properties;
+            }
+
+            // Something else
+            return (RestrictedPlacement_Properties) null;
+        }
+
+        #endregion
+
+    }
+
+}
diff --git a/DLL_Project/Extensions/TerrainWithComps.cs b/DLL_Project/Extensions/TerrainWithComps.cs
new file mode 100644
index 0000000..5581a07
--- /dev/null
+++ b/DLL_Project/Extensions/TerrainWithComps.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+
+using RimWorld;
+using Verse;
+
+namespace CommunityCoreLibrary
+{
+    
+	public class TerrainWithComps : TerrainDef
+	{
+
+        #region XML Data
+
+        public List< CompProperties >       comps = new List< CompProperties >();
+		
+        #endregion
+
+        //[Unsaved]
+
+        #region Instance Data
+
+        #endregion
+
+        #region Process State
+
+#if DEBUG
+        public override void                PostLoad()
+        {
+            base.PostLoad();
+
+            // Validate place workers
+            if( ( placeWorkers != null )&&
+                ( placeWorkers.Count > 0 ) )
+            {
+                // Terrain with comps only supports a small set of place workers
+                foreach( var placeWorker in placeWorkers )
+                {
+                    if(
+                        ( placeWorker != typeof( PlaceWorker_NotOnTerrain ) )&&
+                        ( placeWorker != typeof( PlaceWorker_OnlyOnTerrain ) )&&
+                        ( placeWorker != typeof( PlaceWorker_NotUnderRoof ) )&&
+                        ( placeWorker != typeof( PlaceWorker_OnlyUnderRoof ) )
+                    )
+                    {
+                        Log.Error( "Community Core Library :: TerrainWithComps :: PlaceWorker( " + placeWorker.FullName + " ) is invalid for TerrainWithComps in " + defName );
+                    }
+                }
+            }
+
+            // Validate comps
+            if( ( comps != null )&&
+                ( comps.Count > 0 ) )
+            {
+                // Terrain with comps only supports a small set of comps
+                for( int i = 0; i < comps.Count; ++i )
+                {
+                    var comp = comps[ i ];
+                    var compClass = comp.compClass;
+                    if(
+                        ( compClass != typeof( RestrictedPlacement_Comp ) )
+                    )
+                    {
+                        Log.Error( "Community Core Library :: TerrainWithComps :: comp( " + compClass.FullName + " ) is invalid for TerrainWithComps in " + defName );
+                    }
+                }
+            }
+        }
+#endif
+
+        #endregion
+
+        #region Query State
+
+		public CompProperties               GetCompProperties( Type compType )
+		{
+            for( int i = 0; i < comps.Count; i++ )
+            {
+                if( comps[ i ].compClass == compType )
+                {
+                    return comps[ i ];
+				}
+			}
+            return (CompProperties) null;
+		}
+
+        #endregion
+
+	}
+
+}
diff --git a/DLL_Project/Extensions/ThingDef_Extensions.cs b/DLL_Project/Extensions/ThingDef_Extensions.cs
index ee01fe3..ca946a0 100644
--- a/DLL_Project/Extensions/ThingDef_Extensions.cs
+++ b/DLL_Project/Extensions/ThingDef_Extensions.cs
@@ -1,5 +1,7 @@
 using System.Reflection;
+using System.Collections.Generic;
 
+using RimWorld;
 using Verse;
 
 namespace CommunityCoreLibrary
@@ -10,10 +12,35 @@ public static class ThingDef_Extensions
 
         #region Recipe Cache
 
-        public static void                  RecacheRecipes( this ThingDef thingDef )
+        public static void                  RecacheRecipes( this ThingDef thingDef, bool validateBills )
         {
             //Log.Message( building.LabelCap + " - Recaching" );
             typeof( ThingDef ).GetField( "allRecipesCached", BindingFlags.Instance | BindingFlags.NonPublic ).SetValue( thingDef, null );
+
+            if( !validateBills )
+            {
+                return;
+            }
+
+            // Get the recached recipes
+            var recipes = thingDef.AllRecipes;
+
+            // Remove bill on any table of this def using invalid recipes
+            var buildings = Find.ListerBuildings.AllBuildingsColonistOfDef( thingDef );
+            foreach( var building in buildings )
+            {
+                var BillGiver = building as IBillGiver;
+                for( int i = 0; i < BillGiver.BillStack.Count; ++ i )
+                {
+                    var bill = BillGiver.BillStack[ i ];
+                    if( !recipes.Exists( r => bill.recipe == r ) )
+                    {
+                        BillGiver.BillStack.Delete( bill );
+                        continue;
+                    }
+                }
+            }
+
         }
 
         #endregion
@@ -35,11 +62,6 @@ public static Verse.CompProperties_Rottable CompProperties_Rottable ( this Thing
             return thingDef.GetCompProperties( typeof( RimWorld.CompRottable ) ) as Verse.CompProperties_Rottable;
         }
 
-        public static CommunityCoreLibrary.RestrictedPlacement_Properties RestrictedPlacement_Properties ( this ThingDef thingDef )
-        {
-            return thingDef.GetCompProperties( typeof( CommunityCoreLibrary.RestrictedPlacement_Comp ) ) as CommunityCoreLibrary.RestrictedPlacement_Properties;
-        }
-
         #endregion
 
     }
diff --git a/DLL_Project/ITabs/ModInit.cs b/DLL_Project/ITabs/ModInit.cs
index e86d39c..b1a8988 100644
--- a/DLL_Project/ITabs/ModInit.cs
+++ b/DLL_Project/ITabs/ModInit.cs
@@ -6,15 +6,15 @@ namespace CommunityCoreLibrary
 
     public class ModInit : ITab
     {
-        
-        protected GameObject                gameObject;
+
+        public static GameObject            gameObject;
 
         public ModInit()
         {
             if( gameObject == null )
             {
                 gameObject = new GameObject( "CCLController" );
-                gameObject.AddComponent< Controller >();
+                gameObject.AddComponent< ModController >();
                 Object.DontDestroyOnLoad( gameObject );
             }
         }
diff --git a/DLL_Project/MainTabs/MainTabWindow_ModHelp.cs b/DLL_Project/MainTabs/MainTabWindow_ModHelp.cs
new file mode 100644
index 0000000..3df9eb9
--- /dev/null
+++ b/DLL_Project/MainTabs/MainTabWindow_ModHelp.cs
@@ -0,0 +1,392 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using RimWorld;
+using UnityEngine;
+using Verse;
+
+namespace CommunityCoreLibrary
+{
+
+    public class MainTabWindow_ModHelp : MainTabWindow
+    {
+
+        #region Instance Data
+
+        protected List<ModCategory> _cachedHelpCategories;
+        protected HelpDef SelectedHelpDef;
+
+        public const float Margin = 18f;
+        public const float EntryHeight = 40f;
+        public const float EntryIndent = 50f;
+
+        protected Rect SelectionRect;
+        protected Rect DisplayRect;
+        protected static Vector2 ArrowImageSize = new Vector2(15f, 15f);
+
+        protected Vector2 selectionScrollPos = default(Vector2);
+        protected Vector2 displayScrollPos = default(Vector2);
+
+        public const float MinWidth = 600f;
+        public const float MinHeight = 400f;
+        public const float MinListWidth = 200f;
+
+        public override MainTabWindowAnchor Anchor
+        {
+            get
+            {
+                return MainTabWindowAnchor.Right;
+            }
+        }
+
+        public override Vector2 RequestedTabSize
+        {
+            get
+            {
+                if (TabDef != null)
+                {
+                    return new Vector2(TabDef.windowSize.x > MinWidth ? TabDef.windowSize.x : MinWidth, TabDef.windowSize.y > MinHeight ? TabDef.windowSize.y : MinHeight);
+                }
+                return new Vector2(MinWidth, MinHeight);
+            }
+        }
+
+        private MainTab_HelpMenuDef TabDef
+        {
+            get
+            {
+                return def as MainTab_HelpMenuDef;
+            }
+        }
+
+        #endregion
+
+        #region Constructor
+        public MainTabWindow_ModHelp()
+        {
+            this.layer = WindowLayer.GameUI;
+            this.soundAppear = null;
+            this.soundClose = null;
+            this.doCloseButton = false;
+            this.doCloseX = true;
+            this.closeOnEscapeKey = true;
+        }
+
+        #endregion
+
+        #region Category Cache Object
+
+        protected class ModCategory
+        {
+            readonly List<HelpCategoryDef> helpCategories = new List<HelpCategoryDef>();
+
+            public readonly string ModName;
+            public bool Expanded;
+
+            public ModCategory(string modName)
+            {
+                ModName = modName;
+            }
+
+            public List<HelpCategoryDef> HelpCategories
+            {
+                get
+                {
+                    return helpCategories.OrderBy(a => a.label).ToList();
+                }
+            }
+
+            public float DrawHeight
+            {
+                get
+                {
+                    return Expanded
+                        ? MainTabWindow_ModHelp.EntryHeight + HelpCategories.Sum(cat => cat.DrawHeight)
+                        : EntryHeight;
+                }
+            }
+
+            public void AddCategory(HelpCategoryDef def)
+            {
+                if (!helpCategories.Contains(def))
+                {
+                    helpCategories.Add(def);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Category Cache Control
+
+        public override void PreOpen()
+        {
+            base.PreOpen();
+            Reinit();
+        }
+
+        private void Reinit()
+        {
+            //Set whether the window forces a pause
+            if (TabDef != null)
+            {
+                this.forcePause = TabDef.pauseGame;
+            }
+
+            _cachedHelpCategories = new List<ModCategory>();
+            foreach (var cat in DefDatabase<HelpCategoryDef>.AllDefs)
+            {
+                if (_cachedHelpCategories.All(t => t.ModName != cat.ModName))
+                {
+                    var mCat = new ModCategory(cat.ModName);
+                    mCat.AddCategory(cat);
+                    _cachedHelpCategories.Add(mCat);
+                }
+                else
+                {
+                    var mCat = _cachedHelpCategories.Find(t => t.ModName == cat.ModName);
+                    mCat.AddCategory(cat);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OTab Rendering
+
+        public override void DoWindowContents(Rect rect)
+        {
+            base.DoWindowContents(rect);
+
+            Text.Font = GameFont.Small;
+
+            Rect inRect = rect.ContractedBy(Margin);
+
+            GUI.BeginGroup(inRect);
+
+            float selectionWidth = TabDef != null ? (TabDef.listWidth >= MinListWidth ? TabDef.listWidth : MinListWidth) : MinListWidth;
+            SelectionRect = new Rect(0f, 0f, selectionWidth, inRect.height);
+            DisplayRect = new Rect(
+                SelectionRect.width + Margin, 0f,
+                inRect.width - SelectionRect.width - Margin, inRect.height);
+
+            DrawSelectionArea(SelectionRect);
+            DrawDisplayArea(DisplayRect);
+            Widgets.DrawLineVertical(SelectionRect.xMax + Margin / 2f, 0f, inRect.height);
+
+            GUI.EndGroup();
+        }
+
+        void DrawDisplayArea(Rect rect)
+        {
+            Widgets.DrawMenuSection(rect);
+
+            if (SelectedHelpDef == null)
+            {
+                return;
+            }
+
+            GUI.BeginGroup(rect);
+
+            var titleRect = new Rect(0f, 0f, rect.width, 60f);
+            Text.Font = GameFont.Medium;
+            Text.Anchor = TextAnchor.MiddleCenter;
+            Widgets.Label(titleRect, SelectedHelpDef.LabelCap);
+            Text.Font = GameFont.Small;
+            Text.Anchor = TextAnchor.UpperLeft;
+
+            Widgets.DrawLineHorizontal(0f, titleRect.yMax, rect.width);
+
+            var outRect = new Rect(
+                Margin, titleRect.yMax + Margin,
+                rect.width - Margin, rect.height - titleRect.yMax - Margin);
+
+            float height = Text.CalcHeight(SelectedHelpDef.description, outRect.width - 16f);
+
+            var viewRect = new Rect(
+                outRect.x, outRect.y,
+                outRect.width - 16f, height);
+
+            Widgets.BeginScrollView(outRect, ref displayScrollPos, viewRect);
+            Widgets.Label(viewRect, SelectedHelpDef.description);
+            Widgets.EndScrollView();
+
+            GUI.EndGroup();
+        }
+
+        void DrawSelectionArea(Rect rect)
+        {
+            Widgets.DrawMenuSection(rect);
+            GUI.BeginGroup(rect);
+
+            Rect outRect = rect.AtZero();
+            float height = _cachedHelpCategories.Sum(c => c.DrawHeight);
+            var viewRect = new Rect(0f, 0f, outRect.width - 16f, height);
+            float curY = outRect.y;
+
+            Widgets.BeginScrollView(outRect, ref selectionScrollPos, viewRect);
+            if (_cachedHelpCategories.Count < 1)
+            {
+                Rect messageRect = outRect.AtZero();
+                Widgets.Label(messageRect, "NoHelpDefs".Translate());
+            }
+            else
+            {
+                foreach (var m in _cachedHelpCategories)
+                {
+                    var entryRect = new Rect(0f, curY, viewRect.width, m.DrawHeight);
+                    DrawModCategory(entryRect, m);
+                    curY += m.DrawHeight;
+                }
+            }
+
+            Widgets.EndScrollView();
+            GUI.EndGroup();
+        }
+
+        void DrawModCategory(Rect entryRect, ModCategory m)
+        {
+            GUI.BeginGroup(entryRect);
+
+            float curY = 0f;
+            var modRect = new Rect(0f, 0f, entryRect.width, EntryHeight);
+            DrawModRow(modRect, m);
+            curY += EntryHeight;
+            if (m.Expanded)
+            {
+                foreach (var cat in m.HelpCategories)
+                {
+                    var catRect = new Rect(0f, curY, entryRect.width, cat.DrawHeight);
+                    DrawHelpCategory(catRect, cat);
+                    curY += cat.DrawHeight;
+                }
+            }
+            GUI.EndGroup();
+        }
+
+        void DrawModRow(Rect modRect, ModCategory mod)
+        {
+            GUI.BeginGroup(modRect);
+
+            if (modRect.Contains(Event.current.mousePosition))
+            {
+                Widgets.DrawHighlight(modRect);
+            }
+
+            var imageRect = new Rect(
+                Margin, modRect.height / 2f - ArrowImageSize.y / 2f,
+                ArrowImageSize.x, ArrowImageSize.y);
+
+            Texture2D texture = mod.Expanded ? Icon.HelpMenuArrowUp : Icon.HelpMenuArrowDown;
+            GUI.DrawTexture(imageRect, texture);
+
+            var labelRect = new Rect(
+                imageRect.xMax + Margin, 0f,
+                modRect.width - ArrowImageSize.x - Margin * 2, EntryHeight);
+
+            Text.Anchor = TextAnchor.MiddleLeft;
+            GUI.color = Color.yellow;
+            Widgets.Label(labelRect, mod.ModName);
+            GUI.color = Color.white;
+            Text.Anchor = TextAnchor.UpperLeft;
+
+            if (Widgets.InvisibleButton(modRect))
+            {
+                mod.Expanded = !mod.Expanded;
+            }
+            GUI.EndGroup();
+        }
+
+        void DrawHelpCategory(Rect catRect, HelpCategoryDef cat)
+        {
+            GUI.BeginGroup(catRect);
+
+            var catRowRect = new Rect(0f, 0f, catRect.width, EntryHeight);
+            DrawHelpCategoryRow(catRowRect, cat);
+
+            if (cat.Expanded)
+            {
+                float curY = EntryHeight;
+                foreach (var helpDef in cat.HelpDefs)
+                {
+                    var helpRect = new Rect(
+                        EntryIndent, curY,
+                        catRect.width, EntryHeight);
+
+                    DrawHelpRow(helpRect, helpDef);
+                    GUI.color = Color.gray;
+                    Widgets.DrawLineHorizontal(0f, curY, catRect.width);
+                    GUI.color = Color.white;
+
+                    curY += EntryHeight;
+                }
+            }
+
+            Text.Anchor = TextAnchor.UpperLeft;
+            GUI.EndGroup();
+        }
+
+        void DrawHelpCategoryRow(Rect catRect, HelpCategoryDef cat)
+        {
+            GUI.BeginGroup(catRect);
+
+            if (catRect.Contains(Event.current.mousePosition))
+            {
+                Widgets.DrawHighlight(catRect);
+            }
+
+            var imageRect = new Rect(
+                Margin * 2, catRect.height / 2f - ArrowImageSize.y / 2f,
+                ArrowImageSize.x, ArrowImageSize.y);
+
+            Texture2D texture = cat.Expanded ? Icon.HelpMenuArrowUp : Icon.HelpMenuArrowDown;
+            GUI.DrawTexture(imageRect, texture);
+
+            var labelRect = new Rect(
+                imageRect.xMax + Margin, 0f,
+                catRect.width - imageRect.width - Margin * 3, catRect.height);
+
+            Text.Anchor = TextAnchor.MiddleLeft;
+            Widgets.Label(labelRect, cat.LabelCap);
+            Text.Anchor = TextAnchor.UpperLeft;
+
+            GUI.color = Color.gray;
+            Widgets.DrawLineHorizontal(0f, 0f, catRect.width);
+            GUI.color = Color.white;
+
+            if (Widgets.InvisibleButton(catRect))
+            {
+                cat.Expanded = !cat.Expanded;
+            }
+
+            Text.Anchor = TextAnchor.UpperLeft;
+            GUI.EndGroup();
+        }
+
+        void DrawHelpRow(Rect hRect, HelpDef hCat)
+        {
+            if (hCat == SelectedHelpDef)
+            {
+                Widgets.DrawHighlightSelected(hRect);
+            }
+            else if (hRect.Contains(Event.current.mousePosition))
+            {
+                Widgets.DrawHighlight(hRect);
+            }
+
+            Text.Anchor = TextAnchor.MiddleLeft;
+            Widgets.Label(hRect, hCat.LabelCap);
+            Text.Anchor = TextAnchor.UpperLeft;
+
+            if (Widgets.InvisibleButton(hRect))
+            {
+                SelectedHelpDef = hCat;
+            }
+        }
+
+        #endregion
+
+    }
+
+}
diff --git a/DLL_Project/MapComponents/ResearchControl.cs b/DLL_Project/MapComponents/ResearchController.cs
similarity index 60%
rename from DLL_Project/MapComponents/ResearchControl.cs
rename to DLL_Project/MapComponents/ResearchController.cs
index b1497ea..d1eb69d 100644
--- a/DLL_Project/MapComponents/ResearchControl.cs
+++ b/DLL_Project/MapComponents/ResearchController.cs
@@ -1,257 +1,221 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using RimWorld;
-using Verse;
-
-namespace CommunityCoreLibrary
-{
-
-    public class ResearchControl : MapComponent
-    {
-
-        const int                           TicksPerSecond = 60;
-        const int                           UpdatesPerSecond = 2;
-        const int                           BaseUpdateTicks = TicksPerSecond / UpdatesPerSecond;
-        int                                 UpdateTicks;
-
-        List< AdvancedResearchDef >         advancedResearch;
-
-        bool                                wasGodMode;
-
-        bool                                firstRun = true;
-        bool                                okToProcess;
-
-        // These are used to optimize the process so the same data
-        // isn't constantly reprocessed with every itteration.
-        readonly List< ResearchCompletePair > researchCache = new List< ResearchCompletePair >();
-        readonly List< ThingDef >           buildingCache = new List< ThingDef >();
-        readonly List< ResearchMod >        researchModCache = new List< ResearchMod >();
-
-        #region State Management
-
-        public                              ResearchControl()
-        {
-            firstRun = true;
-        }
-
-        void                                InitComponent()
-        {
-            firstRun = false;
-            okToProcess = false;
-
-            // Get the [advanced] research defs
-            advancedResearch = DefDatabase< AdvancedResearchDef >.AllDefs.OrderBy( a => a.Priority ).ToList();
-
-            if( ( advancedResearch == null )||
-                ( advancedResearch.Count == 0 ) )
-            {
-                Log.Message( "Community Core Library :: Advanced Research :: No advanced research defined, hybernating..." );
-                return;
-            }
-
-            // Build research quick-reference
-            var researchProjects = DefDatabase< ResearchProjectDef >.AllDefs.ToList();
-            foreach( var researchProject in researchProjects )
-            {
-                researchCache.Add( new ResearchCompletePair( researchProject ) );
-            }
-
-            // Set the initial state
-            SetInitialState();
-
-            // Set for an immediate research check
-            UpdateTicks = 0;
-            okToProcess = true;
-        }
-
-        void                                UpdateComponent()
-        {
-            if( firstRun )
-            {
-                InitComponent();
-            }
-
-            if( !okToProcess )
-            {
-                return;
-            }
-
-            UpdateTicks--;
-            if( UpdateTicks > 0 )
-            {
-                return;
-            }
-
-            UpdateTicks = BaseUpdateTicks;
-
-            wasGodMode |= Game.GodMode;
-
-            CheckAdvancedResearch();
-        }
-
-        public override void                MapComponentOnGUI()
-        {
-            base.MapComponentOnGUI();
-            UpdateComponent();
-        }
-
-        public override void                MapComponentTick()
-        {
-            base.MapComponentTick();
-            UpdateComponent();
-        }
-
-        #endregion
-
-        #region Cache Processing
-
-        void                                PrepareCaches()
-        {
-            // Prepare the caches
-            buildingCache.Clear();
-            researchModCache.Clear();
-        }
-
-        void                                ProcessCaches()
-        {
-            // Process the caches
-
-            // Recache the buildings recipes
-            foreach( var building in buildingCache )
-            {
-                building.RecacheRecipes();
-            }
-
-            // Apply all the research mods
-            foreach( var researchMod in researchModCache )
-            {
-                researchMod.Apply();
-            }
-
-        }
-
-        #endregion
-
-        #region Research Processing
-        
-        void                                SetInitialState()
-        {   
-            // Set the initial state of the advanced research
-            PrepareCaches();
-
-            // Process each advanced research def in reverse order
-            for( int i = advancedResearch.Count - 1; i >= 0; i-- )
-            {
-                var Advanced = advancedResearch[ i ];
-
-                if( Advanced.IsRecipeToggle() ){
-                    // Recipe toggle
-                    Advanced.ToggleRecipes( buildingCache, true );
-                }
-                if( Advanced.IsPlantToggle() ){
-                    // Plant toggle
-                    Advanced.TogglePlants( true );
-                }
-                if( Advanced.IsBuildingToggle() ){
-                    // Building toggle
-                    Advanced.ToggleBuildings( true );
-                }
-                if( Advanced.IsResearchToggle() ){
-                    // Research toggle
-                    Advanced.ToggleResearch( true );
-                }
-                // Flag it as disabled to trigger research completion checks
-                Advanced.isEnabled = false;
-            }
-
-            // Now do the work!
-            ProcessCaches();
-
-        }
-
-        void                                CheckAdvancedResearch()
-        {
-            if( !Game.GodMode )
-            {
-                // Quick scan to see if anything changed and early out if nothing new is complete
-
-                if( wasGodMode )
-                {
-                    // Reset everything
-                    SetInitialState();
-                    wasGodMode = false;
-                }
-
-                // God mode is off, do a real check
-                bool Changed = false;
-                for( int i = 0; i < researchCache.Count; i++ ){
-                    var rcPair = researchCache[ i ];
-                    if( ( rcPair.researchProject.IsFinished ) && ( !rcPair.wasComplete ) ){
-                        rcPair.wasComplete = true;
-                        Changed = true;
-                    }
-                }
-
-                if( !Changed )
-                {
-                    // No new research complete
-                    return;
-                }
-            }
-
-            // Prepare for some work
-            PrepareCaches();
-
-            // Scan advanced research for newly completed projects
-            foreach( var Advanced in advancedResearch )
-            {
-                if( ( !Advanced.isEnabled )&&
-                    ( Advanced.ResearchComplete() ) )
-                {
-                    // Process this project
-                    ProcessResearch( Advanced );
-                }
-            }
-
-            // Process caches
-            ProcessCaches();
-        }
-
-        void                                ProcessResearch( AdvancedResearchDef Advanced )
-        {
-            if( Advanced.IsRecipeToggle() )
-            {
-                Advanced.ToggleRecipes( buildingCache );
-            }
-            if( Advanced.IsPlantToggle() )
-            {
-                Advanced.TogglePlants();
-            }
-            if( Advanced.IsBuildingToggle() )
-            {
-                Advanced.ToggleBuildings();
-            }
-            if( Advanced.IsResearchToggle() )
-            {
-                Advanced.ToggleResearch();
-            }
-            if( Advanced.HasCallbacks() )
-            {
-                // Cache callbacks
-                foreach( var researchMod in Advanced.researchMods )
-                {
-                    researchModCache.Add( researchMod );
-                }
-            }
-
-            // Flag it as enabled to skip it in later checks
-            Advanced.isEnabled = true;
-        }
-
-        #endregion
-
-    }
-
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using RimWorld;
+using Verse;
+
+namespace CommunityCoreLibrary
+{
+
+    public class ResearchController : MapComponent
+    {
+
+        const int                           TicksPerSecond = 60;
+        const int                           UpdatesPerSecond = 2;
+        const int                           BaseUpdateTicks = TicksPerSecond / UpdatesPerSecond;
+        int                                 UpdateTicks;
+
+        List< AdvancedResearchDef >         _advancedResearch;
+
+        bool                                wasGodMode;
+
+        bool                                firstRun = true;
+        bool                                okToProcess;
+
+        // These are used to optimize the process so the same data
+        // isn't constantly reprocessed with every itteration.
+        readonly List< ResearchCompletePair > researchCache = new List< ResearchCompletePair >();
+        public static readonly List< ThingDef >    buildingCache = new List< ThingDef >();
+        public static readonly List< AdvancedResearchMod > researchModCache = new List< AdvancedResearchMod >();
+
+        #region State Management
+
+        List< AdvancedResearchDef >         AdvancedResearch
+        {
+            get
+            {
+                if( _advancedResearch == null )
+                {
+                    _advancedResearch = ModController.AdvancedResearch;
+                }
+                return _advancedResearch;
+            }
+        }
+
+        public                              ResearchController()
+        {
+            firstRun = true;
+        }
+
+        void                                InitComponent()
+        {
+            firstRun = false;
+            okToProcess = false;
+
+            if( ( AdvancedResearch == null )||
+                ( AdvancedResearch.Count == 0 ) )
+            {
+                // No advanced research, hybernate
+                Log.Message( "Community Core Library :: Advanced Research :: No advanced research defined, hybernating..." );
+                return;
+            }
+
+            // Build research quick-reference
+            var researchProjects = DefDatabase< ResearchProjectDef >.AllDefs.ToList();
+            foreach( var researchProject in researchProjects )
+            {
+                researchCache.Add( new ResearchCompletePair( researchProject ) );
+            }
+
+            // Set the initial state
+            SetInitialState( true );
+
+            // Set for an immediate research check
+            UpdateTicks = 0;
+            okToProcess = true;
+
+            Log.Message( "Community Core Library :: Advanced Research :: Ready" );
+        }
+
+        void                                UpdateComponent()
+        {
+            if( firstRun )
+            {
+                InitComponent();
+            }
+
+            if( !okToProcess )
+            {
+                return;
+            }
+
+            UpdateTicks--;
+            if( UpdateTicks > 0 )
+            {
+                return;
+            }
+
+            UpdateTicks = BaseUpdateTicks;
+
+            wasGodMode |= Game.GodMode;
+
+            CheckAdvancedResearch();
+        }
+
+        public override void                MapComponentOnGUI()
+        {
+            base.MapComponentOnGUI();
+            UpdateComponent();
+        }
+
+        public override void                MapComponentTick()
+        {
+            base.MapComponentTick();
+            UpdateComponent();
+        }
+
+        #endregion
+
+        #region Cache Processing
+
+        void                                PrepareCaches()
+        {
+            // Prepare the caches
+            buildingCache.Clear();
+            researchModCache.Clear();
+        }
+
+        void                                ProcessCaches( bool setInitialState = false )
+        {
+            // Process the caches
+
+            // Recache the buildings recipes
+            foreach( var building in buildingCache )
+            {
+                building.RecacheRecipes( !setInitialState );
+            }
+
+            // Apply all the research mods
+            foreach( var researchMod in researchModCache )
+            {
+                researchMod.Invoke( !setInitialState );
+            }
+
+        }
+
+        #endregion
+
+        #region Research Processing
+        
+        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 = AdvancedResearch.Count - 1; i >= 0; i-- )
+            {
+                var Advanced = AdvancedResearch[ i ];
+
+                // Reset the project
+                Advanced.Disable( firstTimeRun );
+            }
+
+            // Now do the work!
+            ProcessCaches( true );
+
+        }
+
+        void                                CheckAdvancedResearch()
+        {
+            if( !Game.GodMode )
+            {
+                // Quick scan to see if anything changed and early out if nothing new is complete
+
+                if( wasGodMode )
+                {
+                    // Reset everything
+                    SetInitialState();
+                    wasGodMode = false;
+                }
+
+                // God mode is off, do a real check
+                bool Changed = false;
+                for( int i = 0; i < researchCache.Count; i++ ){
+                    var rcPair = researchCache[ i ];
+                    if( ( rcPair.researchProject.IsFinished ) && ( !rcPair.wasComplete ) ){
+                        rcPair.wasComplete = true;
+                        Changed = true;
+                    }
+                }
+
+                if( !Changed )
+                {
+                    // No new research complete
+                    return;
+                }
+            }
+
+            // Prepare for some work
+            PrepareCaches();
+
+            // Scan advanced research for newly completed projects
+            foreach( var Advanced in AdvancedResearch )
+            {
+                if( Advanced.CanEnable )
+                {
+                    // Enable this project
+                    Advanced.Enable();
+                }
+            }
+
+            // Process caches
+            ProcessCaches();
+        }
+
+        #endregion
+
+    }
+
+}
diff --git a/DLL_Project/MonoBehaviour/Controller.cs b/DLL_Project/MonoBehaviour/Controller.cs
deleted file mode 100644
index 781d21b..0000000
--- a/DLL_Project/MonoBehaviour/Controller.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using RimWorld;
-using UnityEngine;
-using Verse;
-
-namespace CommunityCoreLibrary
-{
-
-    public class Controller : MonoBehaviour
-    {
-        
-        public readonly string              GameObjectName = "Community Core Library";
-
-        Version                             CCLVersion;
-        List< CCLVersionDef >               CCLMods = new List< CCLVersionDef >();
-
-        public void                         Start()
-        {
-            enabled = false;
-
-            // Check versions of mods and throw error to the user if the
-            // mod version requirement is higher than the installed version
-
-            CCLMods = DefDatabase< CCLVersionDef >.AllDefs.ToList();
-
-            GetCCLVersion();
-            CheckModVersionRequirements();
-
-            CheckAdvancedResearch();
-
-            Log.Message( "Community Core Library :: Initialized" );
-
-            enabled = true;
-        }
-
-        public void                         FixedUpdate()
-        {
-            if( ( !ReadyForInjection() )||
-                ( !NeedsComponentInjection() ) )
-            {
-                return;
-            }
-
-            InjectComponents();
-        }
-
-        #region Versioning
-
-        void                                GetCCLVersion ()
-        {
-            System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
-            CCLVersion = assembly.GetName().Version;
-#if DEBUG
-            Log.Message( "Community Core Library v" + CCLVersion + " (debug)" );
-#else
-            Log.Message( "Community Core Library v" + CCLVersion );
-#endif
-        }
-
-        void                                CheckModVersionRequirements()
-        {
-            if( ( CCLMods == null )||
-                ( CCLMods.Count < 1 ) )
-                return;
-
-            var throwError = false;
-            var errors = "Community Core Library dependency error:";
-
-            foreach( var CCLMod in CCLMods )
-            {
-                var modVersion = new Version( CCLMod.version );
-                if( modVersion > CCLVersion ){
-                    errors += "\n\t" + CCLMod.ModName + " requires v" + modVersion;
-                    throwError = true;
-                }
-            }
-
-            if( throwError )
-            {
-                Log.Error( errors );
-            }
-
-        }
-
-        #endregion
-
-        #region Data Verification
-
-        void                                CheckAdvancedResearch()
-        {
-            // Make sure the hidden research exists
-            if( Research.Locker == null )
-            {
-                Log.Error( "Community Core Library :: Advanced Research :: Missing Research.Locker!" );
-            }
-
-            // Get the [advanced] research defs
-            var advancedResearch = DefDatabase< AdvancedResearchDef >.AllDefs.OrderBy( a => a.Priority ).ToList();
-
-            if( ( advancedResearch == null )&&
-                ( advancedResearch.Count == 0 ) )
-            {
-                return;
-            }
-
-            // Validate each advanced research def
-            foreach( var Advanced in advancedResearch )
-            {
-                // Validate recipes
-                if( Advanced.IsRecipeToggle() )
-                {
-                    // Make sure thingDefs are of the appropriate type (has ITab_Bills)
-                    foreach( var buildingDef in Advanced.thingDefs )
-                    {
-                        if( buildingDef.thingClass.GetInterface( "IBillGiver" ) == null ){
-                            Log.Error( "Community Core Library :: Advanced Research :: thingDef( " + buildingDef.defName + " ) is of inappropriate type in AdvancedResearchDef( " + Advanced.defName + " ) - Must implement \"IBillGiver\"" );
-                        }
-                    }
-
-                }
-
-                // Validate plant sowTags
-                if( Advanced.IsPlantToggle() )
-                {
-                    // Make sure things are of the appropriate class (Plant)
-                    foreach( var plantDef in Advanced.thingDefs )
-                    {
-                        if( plantDef.thingClass != typeof( Plant ) )
-                        {
-                            Log.Error( "Community Core Library :: Advanced Research :: thingDef( " + plantDef.defName + " ) is of inappropriate type in AdvancedResearchDef( " + Advanced.defName + " ) - Must be <thingClass> \"Plant\"" );
-                        }
-                    }
-
-                    // Make sure sowTags are valid (!null or empty)
-                    for( int i = 0; i < Advanced.sowTags.Count; i++ )
-                    {
-                        var sowTag = Advanced.sowTags[ i ];
-                        if( string.IsNullOrEmpty( sowTag ) )
-                        {
-                            Log.Error( "Community Core Library :: Advanced Research :: sowTags( index = " + i + " ) resolved to null in AdvancedResearchDef( " + Advanced.defName + " )" );
-                        }
-                    }
-                }
-
-                // Validate buildings
-                if( Advanced.IsBuildingToggle() )
-                {
-                    // Make sure thingDefs are of the appropriate type (has proper designationCategory)
-                    foreach( var buildingDef in Advanced.thingDefs )
-                    {
-                        if( ( string.IsNullOrEmpty( buildingDef.designationCategory ) )||
-                            ( buildingDef.designationCategory.ToLower() == "none" ) )
-                        {
-                            Log.Error( "Community Core Library :: Advanced Research :: thingDef( " + buildingDef.defName + " ) is of inappropriate type in AdvancedResearchDef( " + Advanced.defName + " ) - <designationCategory> must not be null or \"None\"" );
-                        }
-                    }
-                }
-            }
-
-            // All advanced research checked, no log errors means it's all good
-        }
-
-        #endregion
-
-        #region Component Injection
-
-        bool                                NeedsComponentInjection()
-        {
-            return ( !Find.Map.components.Exists( c => c.GetType() == typeof( ResearchControl ) ) );
-        }
-
-        bool                                ReadyForInjection()
-        {
-            return (
-                ( Find.Map != null )&&
-                ( Find.Map.components != null )
-            );
-        }
-
-        void                                InjectComponents()
-        {
-            Find.Map.components.Add( new ResearchControl() );
-            Log.Message( "Community Core Library :: Advanced Research :: Injected into existing save" );
-        }
-
-        #endregion
-
-    }
-
-}
diff --git a/DLL_Project/MonoBehaviour/ModController.cs b/DLL_Project/MonoBehaviour/ModController.cs
new file mode 100644
index 0000000..2a5be25
--- /dev/null
+++ b/DLL_Project/MonoBehaviour/ModController.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using RimWorld;
+using UnityEngine;
+using Verse;
+
+namespace CommunityCoreLibrary
+{
+
+    public class ModController : MonoBehaviour
+    {
+
+        #region Instance Data
+
+        public readonly string              GameObjectName = "Community Core Library";
+
+        public static List< AdvancedResearchDef > AdvancedResearch;
+
+        public static Version               CCLVersion;
+        List< ModHelperDef >                ModHelperDefs;
+
+        #endregion
+
+        #region Mono Callbacks
+
+        public void                         Start()
+        {
+            enabled = false;
+
+            // Check versions of mods and throw error to the user if the
+            // mod version requirement is higher than the installed version
+            GetCCLVersion();
+
+            ModHelperDefs = DefDatabase< ModHelperDef >.AllDefs.ToList();
+
+            if( ( ModHelperDefs != null )&&
+                ( ModHelperDefs.Count > 0 ) )
+            {
+                ValidateMods();
+            }
+
+            // Validate advanced research defs
+            CheckAdvancedResearch();
+
+            Log.Message( "Community Core Library :: Initialized" );
+
+            enabled = true;
+        }
+
+        public void                         FixedUpdate()
+        {
+            if( ReadyForDesignatorInjection() )
+            {
+                InjectDesignators();
+            }
+            if( ReadyForMapComponentInjection() )
+            {
+                InjectMapComponents();
+            }
+        }
+
+        #endregion
+
+        #region Versioning
+
+        void                                GetCCLVersion ()
+        {
+            System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
+            CCLVersion = assembly.GetName().Version;
+#if DEBUG
+            Log.Message( "Community Core Library v" + CCLVersion + " (debug)" );
+#else
+            Log.Message( "Community Core Library v" + CCLVersion );
+#endif
+        }
+
+        #endregion
+
+        #region Mod Validation
+
+        void                                ValidateMods()
+        {
+            for( int i = 0; i < ModHelperDefs.Count; i++ ){
+                var ModHelperDef = ModHelperDefs[ i ];
+                if( !ModHelperDef.IsValid )
+                {
+                    // Don't do anything special with broken mods
+                    ModHelperDefs.Remove( ModHelperDef );
+                    continue;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Research Verification
+
+        void                                CheckAdvancedResearch()
+        {
+            // Make sure the hidden research exists
+            if( Research.Locker == null )
+            {
+                Log.Error( "Community Core Library :: Advanced Research :: Missing Research.Locker!" );
+            }
+
+            // Get the [advanced] research defs
+            AdvancedResearch = DefDatabase< AdvancedResearchDef >.AllDefs.OrderBy( a => a.Priority ).ToList();
+
+            if( ( AdvancedResearch == null )&&
+                ( AdvancedResearch.Count == 0 ) )
+            {
+                return;
+            }
+
+            // Validate each advanced research def
+            for( int i = 0; i < AdvancedResearch.Count; i++ ){
+                var Advanced = AdvancedResearch[ i ];
+
+                if( !Advanced.IsValid )
+                {
+                    // Remove projects with errors from list of usable projects
+                    AdvancedResearch.Remove( Advanced );
+                    continue;
+                }
+            }
+
+            // All advanced research checked, no log errors means it's all good
+        }
+
+        #endregion
+
+        #region Map Component Injection
+
+        bool                                ReadyForMapComponentInjection()
+        {
+            return (
+                ( Find.Map != null )&&
+                ( Find.Map.components != null )
+            );
+        }
+
+        void                                InjectMapComponents()
+        {
+            // Inject the map components into the game
+            foreach( var ModHelperDef in ModHelperDefs )
+            {
+                if( !ModHelperDef.MapComponentsInjected )
+                {
+                    Log.Message( "Community Core Library :: Injecting MapComponents for " + ModHelperDef.ModName );
+                    ModHelperDef.InjectMapComponents();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Designator Injection
+
+        bool                                ReadyForDesignatorInjection()
+        {
+            var DesignatorCategoryDefs = DefDatabase<DesignationCategoryDef>.AllDefs;
+
+            foreach( var DesignatorCategoryDef in DesignatorCategoryDefs )
+            {
+                if( DesignatorCategoryDef.resolvedDesignators == null )
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        void                                InjectDesignators()
+        {
+            // Inject the designators into the categories
+            foreach( var ModHelperDef in ModHelperDefs )
+            {
+                if( !ModHelperDef.DesignatorsInjected )
+                {
+                    Log.Message( "Community Core Library :: Injecting Designators for " + ModHelperDef.ModName );
+                    ModHelperDef.InjectDesignators();
+                }
+            }
+        }
+
+        #endregion
+
+    }
+
+}
diff --git a/DLL_Project/OTabs/OTab_ModHelp.cs b/DLL_Project/OTabs/OTab_ModHelp.cs
deleted file mode 100644
index 7ece0a9..0000000
--- a/DLL_Project/OTabs/OTab_ModHelp.cs
+++ /dev/null
@@ -1,323 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using RimWorld;
-using UnityEngine;
-using Verse;
-
-namespace CommunityCoreLibrary
-{
-    
-    public class OTab_ModHelp : OTab
-    {
-        
-        protected static List<ModCategory>  _cachedHelpCategories;
-        protected static HelpDef            SelectedHelpDef;
-
-        public const float                  Margin = 18f;
-        public const float                  EntryHeight = 40f;
-        public const float                  EntryIndent = 50f;
-
-        protected static Rect               SelectionRect;
-        protected static Rect               DisplayRect;
-        protected static Vector2            ArrowImageSize = new Vector2( 20f, 20f );
-
-        protected Vector2                   selectionScrollPos = default( Vector2 );
-        protected Vector2                   displayScrollPos = default( Vector2 );
-
-        public                              OTab_ModHelp()
-        {
-            title = "HelpOTabTitle".Translate();
-            orderPriority = 998;
-            Reinit();
-        }
-
-        protected class                     ModCategory
-        {
-            readonly List<HelpCategoryDef>  helpCategories = new List<HelpCategoryDef>();
-
-            public readonly string          ModName;
-            public bool                     Expanded;
-
-            public                          ModCategory( string modName )
-            {
-                ModName = modName;
-            }
-
-            public List<HelpCategoryDef>    HelpCategories
-            {
-                get
-                {
-                    return helpCategories.OrderBy( a => a.label ).ToList();
-                }
-            }
-
-            public float                    DrawHeight
-            {
-                get
-                {
-                    return Expanded
-                        ? OTab_ModHelp.EntryHeight + HelpCategories.Sum( cat => cat.DrawHeight )
-                        : EntryHeight;
-                }
-            }
-
-            public void                     AddCategory( HelpCategoryDef def )
-            {
-                if( !helpCategories.Contains( def ) )
-                {
-                    helpCategories.Add( def );
-                }
-            }
-        }
-
-        public void                         Reinit()
-        {
-            _cachedHelpCategories = new List< ModCategory >();
-            foreach( var cat in DefDatabase< HelpCategoryDef >.AllDefs )
-            {
-                if( _cachedHelpCategories.All( t => t.ModName != cat.ModName ) )
-                {
-                    var mCat = new ModCategory( cat.ModName );
-                    mCat.AddCategory( cat );
-                    _cachedHelpCategories.Add( mCat );
-                }
-                else
-                {
-                    var mCat = _cachedHelpCategories.Find( t => t.ModName == cat.ModName );
-                    mCat.AddCategory( cat );
-                }
-            }
-        }
-
-        public override void                OTabOnGUI( Rect rect )
-        {
-            Text.Font = GameFont.Small;
-
-            Rect inRect = rect.ContractedBy( Margin );
-            
-            GUI.BeginGroup( inRect );
-
-            SelectionRect = new Rect( 0f, 0f, 300f, inRect.height );
-            DisplayRect = new Rect(
-                SelectionRect.width + Margin, 0f,
-                inRect.width - SelectionRect.width - Margin, inRect.height );
-
-            DrawSelectionArea( SelectionRect );
-            DrawDisplayArea( DisplayRect );
-            Widgets.DrawLineVertical( SelectionRect.xMax + Margin / 2f, 0f, inRect.height );
-
-            GUI.EndGroup();
-        }
-
-        void                                DrawDisplayArea( Rect rect )
-        {
-            Widgets.DrawMenuSection( rect );
-
-            if( SelectedHelpDef == null )
-            {
-                return;
-            }
-
-            GUI.BeginGroup( rect );
-
-            var titleRect = new Rect( 0f, 0f, rect.width, 60f );
-            Text.Font = GameFont.Medium;
-            Text.Anchor = TextAnchor.MiddleCenter;
-            Widgets.Label( titleRect, SelectedHelpDef.LabelCap );
-            Text.Font = GameFont.Small;
-            Text.Anchor = TextAnchor.UpperLeft;
-
-            Widgets.DrawLineHorizontal( 0f, titleRect.yMax, rect.width );
-
-            var outRect = new Rect(
-                Margin, titleRect.yMax + Margin,
-                rect.width - Margin, rect.height - titleRect.yMax - Margin );
-
-            float height = Text.CalcHeight( SelectedHelpDef.description, outRect.width - 16f );
-
-            var viewRect = new Rect(
-                outRect.x, outRect.y,
-                outRect.width - 16f, height );
-
-            Widgets.BeginScrollView( outRect, ref displayScrollPos, viewRect );
-            Widgets.Label( viewRect, SelectedHelpDef.description );
-            Widgets.EndScrollView();
-
-            GUI.EndGroup();
-        }
-
-        void                                DrawSelectionArea( Rect rect )
-        {
-            Widgets.DrawMenuSection( rect );
-            GUI.BeginGroup( rect );
-
-            Rect outRect = rect.AtZero();
-            float height = _cachedHelpCategories.Sum( c => c.DrawHeight );
-            var viewRect = new Rect( 0f, 0f, outRect.width - 16f, height );
-            float curY = outRect.y;
-
-            Widgets.BeginScrollView( outRect, ref selectionScrollPos, viewRect );
-            if( _cachedHelpCategories.Count < 1 )
-            {
-                Rect messageRect = outRect.AtZero();
-                Widgets.Label( messageRect, "NoHelpDefs".Translate() );
-            }
-            else
-            {
-                foreach( var m in _cachedHelpCategories )
-                {
-                    var entryRect = new Rect( 0f, curY, viewRect.width, m.DrawHeight );
-                    DrawModCategory( entryRect, m );
-                    curY += m.DrawHeight;
-                }
-            }
-
-            Widgets.EndScrollView();
-            GUI.EndGroup();
-        }
-
-        void                                DrawModCategory( Rect entryRect, ModCategory m )
-        {
-            GUI.BeginGroup( entryRect );
-
-            float curY = 0f;
-            var modRect = new Rect( 0f, 0f, entryRect.width, EntryHeight );
-            DrawModRow( modRect, m );
-            curY += EntryHeight;
-            if( m.Expanded )
-            {
-                foreach( var cat in m.HelpCategories )
-                {
-                    var catRect = new Rect( 0f, curY, entryRect.width, cat.DrawHeight );
-                    DrawHelpCategory( catRect, cat );
-                    curY += cat.DrawHeight;
-                }
-            }
-            GUI.EndGroup();
-        }
-
-        void                                DrawModRow( Rect modRect, ModCategory mod )
-        {
-            GUI.BeginGroup( modRect );
-
-            if( modRect.Contains( Event.current.mousePosition ) )
-            {
-                Widgets.DrawHighlight( modRect );
-            }
-
-            var imageRect = new Rect(
-                Margin, modRect.height / 2f - ArrowImageSize.y / 2f,
-                ArrowImageSize.x, ArrowImageSize.y );
-
-            Texture2D texture = mod.Expanded ? Icon.HelpMenuArrowUp : Icon.HelpMenuArrowDown;
-            GUI.DrawTexture(imageRect, texture);
-
-            var labelRect = new Rect(
-                imageRect.xMax + Margin, 0f,
-                modRect.width - ArrowImageSize.x - Margin * 2, EntryHeight );
-            
-            Text.Anchor = TextAnchor.MiddleLeft;
-            GUI.color = Color.yellow;
-            Widgets.Label( labelRect, mod.ModName );
-            GUI.color = Color.white;
-            Text.Anchor = TextAnchor.UpperLeft;
-
-            if( Widgets.InvisibleButton( modRect ) )
-            {
-                mod.Expanded = !mod.Expanded;
-            }
-            GUI.EndGroup();
-        }
-
-        void                                DrawHelpCategory( Rect catRect, HelpCategoryDef cat )
-        {
-            GUI.BeginGroup( catRect );
-
-            var catRowRect = new Rect( 0f, 0f, catRect.width, EntryHeight );
-            DrawHelpCategoryRow( catRowRect, cat );
-
-            if( cat.Expanded )
-            {
-                float curY = EntryHeight;
-                foreach( var helpDef in cat.HelpDefs )
-                {
-                    var helpRect = new Rect(
-                        EntryIndent, curY,
-                        catRect.width, EntryHeight );
-                    
-                    DrawHelpRow( helpRect, helpDef );
-                    GUI.color = Color.gray;
-                    Widgets.DrawLineHorizontal( 0f, curY, catRect.width );
-                    GUI.color = Color.white;
-
-                    curY += EntryHeight;
-                }
-            }
-
-            Text.Anchor = TextAnchor.UpperLeft;
-            GUI.EndGroup();
-        }
-
-        void                                DrawHelpCategoryRow( Rect catRect, HelpCategoryDef cat )
-        {
-            GUI.BeginGroup( catRect );
-
-            if( catRect.Contains( Event.current.mousePosition ) )
-            {
-                Widgets.DrawHighlight( catRect );
-            }
-
-            var imageRect = new Rect(
-                Margin * 2, catRect.height / 2f - ArrowImageSize.y / 2f,
-                ArrowImageSize.x, ArrowImageSize.y );
-            
-            Texture2D texture = cat.Expanded ? Icon.HelpMenuArrowUp : Icon.HelpMenuArrowDown;
-            GUI.DrawTexture( imageRect, texture );
-
-            var labelRect = new Rect(
-                imageRect.xMax + Margin, 0f,
-                catRect.width - imageRect.width - Margin * 3, catRect.height );
-
-            Text.Anchor = TextAnchor.MiddleLeft;
-            Widgets.Label( labelRect, cat.LabelCap );
-            Text.Anchor = TextAnchor.UpperLeft;
-
-            GUI.color = Color.gray;
-            Widgets.DrawLineHorizontal( 0f, 0f, catRect.width );
-            GUI.color = Color.white;
-
-            if( Widgets.InvisibleButton( catRect ) )
-            {
-                cat.Expanded = !cat.Expanded;
-            }
-
-            Text.Anchor = TextAnchor.UpperLeft;
-            GUI.EndGroup();
-        }
-
-        void                                DrawHelpRow( Rect hRect, HelpDef hCat )
-        {
-            if( hCat == SelectedHelpDef )
-            {
-                Widgets.DrawHighlightSelected( hRect );
-            }
-            else if( hRect.Contains( Event.current.mousePosition ) )
-            {
-                Widgets.DrawHighlight( hRect );
-            }
-
-            Text.Anchor = TextAnchor.MiddleLeft;
-            Widgets.Label( hRect, hCat.LabelCap );
-            Text.Anchor = TextAnchor.UpperLeft;
-
-            if( Widgets.InvisibleButton( hRect ) )
-            {
-                OTab_ModHelp.SelectedHelpDef = hCat;
-            }
-        }
-
-    }
-
-}
diff --git a/DLL_Project/PlaceWorkers/PlaceWorker_NotOnTerrain.cs b/DLL_Project/PlaceWorkers/PlaceWorker_NotOnTerrain.cs
index defe6d2..b2c62c4 100644
--- a/DLL_Project/PlaceWorkers/PlaceWorker_NotOnTerrain.cs
+++ b/DLL_Project/PlaceWorkers/PlaceWorker_NotOnTerrain.cs
@@ -8,16 +8,7 @@ public class PlaceWorker_NotOnTerrain : PlaceWorker
         
         public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, IntVec3 loc, Rot4 rot )
         {
-            var thingDef = checkingDef as ThingDef;
-#if DEBUG
-            if( thingDef == null )
-            {
-                Log.Error( "Community Core Library :: Restricted PlaceWorker :: NotOnTerrain - Unable to cast BuildableDef to ThingDef!" );
-                return AcceptanceReport.WasRejected;
-            }
-#endif
-
-            var Restrictions = thingDef.RestrictedPlacement_Properties();
+            var Restrictions = checkingDef.RestrictedPlacement_Properties();
 #if DEBUG
             if( Restrictions == null )
             {
@@ -31,7 +22,7 @@ public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, Int
             {
                 if( Restrictions.RestrictedTerrain[ i ] == terrainDef )
                 {
-                    return (AcceptanceReport)"MessagePlacementNotOn".Translate() + terrainDef.label;
+                    return (AcceptanceReport)( "MessagePlacementNotOn".Translate() + terrainDef.label );
                 }
             }
 
diff --git a/DLL_Project/PlaceWorkers/PlaceWorker_NotOnThing.cs b/DLL_Project/PlaceWorkers/PlaceWorker_NotOnThing.cs
index 1b65dc8..3ab3584 100644
--- a/DLL_Project/PlaceWorkers/PlaceWorker_NotOnThing.cs
+++ b/DLL_Project/PlaceWorkers/PlaceWorker_NotOnThing.cs
@@ -7,16 +7,7 @@ public class PlaceWorker_NotOnThing : PlaceWorker
     {
         public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, IntVec3 loc, Rot4 rot )
         {
-            var thingDef = checkingDef as ThingDef;
-#if DEBUG
-            if( thingDef == null )
-            {
-                Log.Error( "Community Core Library :: Restricted PlaceWorker :: NotOnThing - Unable to cast BuildableDef to ThingDef!" );
-                return AcceptanceReport.WasRejected;
-            }
-#endif
-
-            var Restrictions = thingDef.RestrictedPlacement_Properties();
+            var Restrictions = checkingDef.RestrictedPlacement_Properties();
 #if DEBUG
             if( Restrictions == null )
             {
@@ -29,7 +20,7 @@ public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, Int
             {
                 if( Restrictions.RestrictedThing.Find( r => r == t.def ) != null )
                 {
-                    return (AcceptanceReport)"MessagePlacementNotOn".Translate() + t.def.label;
+                    return (AcceptanceReport)( "MessagePlacementNotOn".Translate() + t.def.label );
                 }
             }
 
diff --git a/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnSurface.cs b/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnSurface.cs
index b02266c..1c01042 100644
--- a/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnSurface.cs
+++ b/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnSurface.cs
@@ -16,7 +16,7 @@ public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, Int
                 }
             }
 
-            return (AcceptanceReport)"MessagePlacementItemSurface".Translate();
+            return (AcceptanceReport)( "MessagePlacementItemSurface".Translate() );
         }
 
     }
diff --git a/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnTerrain.cs b/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnTerrain.cs
index d18e59f..42b72b4 100644
--- a/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnTerrain.cs
+++ b/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnTerrain.cs
@@ -8,16 +8,7 @@ public class PlaceWorker_OnlyOnTerrain : PlaceWorker
         
         public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, IntVec3 loc, Rot4 rot )
         {
-            var thingDef = checkingDef as ThingDef;
-#if DEBUG
-            if( thingDef == null )
-            {
-                Log.Error( "Community Core Library :: Restricted PlaceWorker :: OnlyOnTerrain - Unable to cast BuildableDef to ThingDef!" );
-                return AcceptanceReport.WasRejected;
-            }
-#endif
-
-            var Restrictions = thingDef.RestrictedPlacement_Properties();
+            var Restrictions = checkingDef.RestrictedPlacement_Properties();
 #if DEBUG
             if( Restrictions == null )
             {
@@ -35,7 +26,7 @@ public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, Int
                 }
             }
 
-            return (AcceptanceReport)"MessagePlacementNotOn".Translate() + terrainDef.label;
+            return (AcceptanceReport)( "MessagePlacementNotOn".Translate() + terrainDef.label );
         }
 
     }
diff --git a/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnThing.cs b/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnThing.cs
index 4bbc8a6..3a1106f 100644
--- a/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnThing.cs
+++ b/DLL_Project/PlaceWorkers/PlaceWorker_OnlyOnThing.cs
@@ -9,20 +9,20 @@ public class PlaceWorker_OnlyOnThing : PlaceWorker
         
         public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, IntVec3 loc, Rot4 rot )
         {
-            var thingDef = checkingDef as ThingDef;
+            var Restrictions = checkingDef.RestrictedPlacement_Properties();
 #if DEBUG
-            if( thingDef == null )
+            if( Restrictions == null )
             {
-                Log.Error( "Community Core Library :: Restricted PlaceWorker :: OnlyOnThing - Unable to cast BuildableDef to ThingDef!" );
+                Log.Error( "Community Core Library :: Restricted PlaceWorker :: OnlyOnThing - Unable to get properties!" );
                 return AcceptanceReport.WasRejected;
             }
 #endif
 
-            var Restrictions = thingDef.RestrictedPlacement_Properties();
+            var thingDef = checkingDef as ThingDef;
 #if DEBUG
-            if( Restrictions == null )
+            if( thingDef == null )
             {
-                Log.Error( "Community Core Library :: Restricted PlaceWorker :: OnlyOnThing - Unable to get properties!" );
+                Log.Error( "Community Core Library :: Restricted PlaceWorker :: OnlyOnThing - Unable to cast BuildableDef to ThingDef!" );
                 return AcceptanceReport.WasRejected;
             }
 #endif
@@ -43,7 +43,7 @@ public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, Int
                 }
             }
 
-            return (AcceptanceReport)"MessagePlacementNotHere".Translate();
+            return (AcceptanceReport)( "MessagePlacementNotHere".Translate() );
         }
 
     }
diff --git a/DLL_Project/PlaceWorkers/PlaceWorker_OnlyUnderRoof.cs b/DLL_Project/PlaceWorkers/PlaceWorker_OnlyUnderRoof.cs
index 58a7a19..61e3ac4 100644
--- a/DLL_Project/PlaceWorkers/PlaceWorker_OnlyUnderRoof.cs
+++ b/DLL_Project/PlaceWorkers/PlaceWorker_OnlyUnderRoof.cs
@@ -10,7 +10,7 @@ public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, Int
         {
             return Find.RoofGrid.Roofed( loc )
                 ? AcceptanceReport.WasAccepted
-                : ( AcceptanceReport )"MessagePlacementMustBeUnderRoof".Translate();
+                : ( AcceptanceReport )( "MessagePlacementMustBeUnderRoof".Translate() );
         }
 
     }
diff --git a/DLL_Project/PlaceWorkers/PlaceWorker_RestrictedCount.cs b/DLL_Project/PlaceWorkers/PlaceWorker_RestrictedCount.cs
index 3f50704..8dd1f2d 100644
--- a/DLL_Project/PlaceWorkers/PlaceWorker_RestrictedCount.cs
+++ b/DLL_Project/PlaceWorkers/PlaceWorker_RestrictedCount.cs
@@ -8,18 +8,18 @@ public class PlaceWorker_RestrictedCount : PlaceWorker
         
         public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, IntVec3 loc, Rot4 rot )
         {
-            var thingDef = checkingDef as ThingDef;
+            var Restrictions = checkingDef.RestrictedPlacement_Properties();
 #if DEBUG
-            if( thingDef == null ){
-                Log.Error( "Community Core Library :: Restricted PlaceWorker :: RestrictedCount - Unable to cast BuildableDef to ThingDef!" );
+            if( Restrictions == null ){
+                Log.Error( "Community Core Library :: Restricted PlaceWorker :: RestrictedCount - Unable to get properties!" );
                 return AcceptanceReport.WasRejected;
             }
 #endif
 
-            var Restrictions = thingDef.RestrictedPlacement_Properties();
+            var thingDef = checkingDef as ThingDef;
 #if DEBUG
-            if( Restrictions == null ){
-                Log.Error( "Community Core Library :: Restricted PlaceWorker :: RestrictedCount - Unable to get properties!" );
+            if( thingDef == null ){
+                Log.Error( "Community Core Library :: Restricted PlaceWorker :: RestrictedCount - Unable to cast BuildableDef to ThingDef!" );
                 return AcceptanceReport.WasRejected;
             }
 #endif
diff --git a/DLL_Project/PlaceWorkers/PlaceWorker_WallAttachment.cs b/DLL_Project/PlaceWorkers/PlaceWorker_WallAttachment.cs
index d9ce1bb..2713573 100644
--- a/DLL_Project/PlaceWorkers/PlaceWorker_WallAttachment.cs
+++ b/DLL_Project/PlaceWorkers/PlaceWorker_WallAttachment.cs
@@ -13,12 +13,12 @@ public override AcceptanceReport    AllowsPlacing( BuildableDef checkingDef, Int
             Building support = c.GetEdifice();
             if( support == null )
             {
-                return (AcceptanceReport)"MessagePlacementAgainstSupport".Translate();
+                return (AcceptanceReport)( "MessagePlacementAgainstSupport".Translate() );
             }
 
             return ( support.def.graphicData.linkFlags & ( LinkFlags.Rock | LinkFlags.Wall ) ) != 0
                 ? AcceptanceReport.WasAccepted
-                : ( AcceptanceReport )"MessagePlacementAgainstSupport".Translate();
+                : ( AcceptanceReport )( "MessagePlacementAgainstSupport".Translate() );
         }
 
     }
diff --git a/DLL_Project/Properties/AssemblyInfo.cs b/DLL_Project/Properties/AssemblyInfo.cs
index 14c5a93..6077107 100644
--- a/DLL_Project/Properties/AssemblyInfo.cs
+++ b/DLL_Project/Properties/AssemblyInfo.cs
@@ -12,23 +12,21 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
-// für COM-Komponenten.  Wenn Sie auf einen Typ in dieser Assembly von 
-// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
+// Set ComVisible to false as we're not doing any COM stuff
 [assembly: ComVisible(false)]
 
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+// Need a GUID for the COM we aren't using
 [assembly: Guid("a8e081b6-8768-4fe9-817f-f0ee42cf13ef")]
 
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+// Versions information for the assembly:
 //
-//      Hauptversion
-//      Nebenversion 
-//      Buildnummer
+//      Major
+//      Minor
+//      Build
 //      Revision
 //
-// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
-// übernehmen, indem Sie "*" eingeben:
+// Can leave some values to be auto-defined such as Build and Revision
+// For auto-defined values use "*", eg:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.11.5")]
-[assembly: AssemblyFileVersion("0.11.5")]
+[assembly: AssemblyVersion("0.12.0")]
+[assembly: AssemblyFileVersion("0.12.0")]
diff --git a/DLL_Project/StaticClasses/Research.cs b/DLL_Project/StaticClasses/Research.cs
index d1ccb09..0b652b0 100644
--- a/DLL_Project/StaticClasses/Research.cs
+++ b/DLL_Project/StaticClasses/Research.cs
@@ -3,6 +3,8 @@
 namespace CommunityCoreLibrary
 {
 
+    public delegate void                     AdvancedResearchMod( bool Enable );
+
     public static class Research
     {
         
diff --git a/DLL_Project/Structures/DesignatorData.cs b/DLL_Project/Structures/DesignatorData.cs
new file mode 100644
index 0000000..af296e7
--- /dev/null
+++ b/DLL_Project/Structures/DesignatorData.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace CommunityCoreLibrary
+{
+
+    public struct DesignatorData
+    {
+        
+        public string           designatorClass;
+
+        public string           designationCategoryDef;
+
+    }
+}
diff --git a/DLL_Project/ThingComps/CompLifespanPowered.cs b/DLL_Project/ThingComps/CompLifespanPowered.cs
index 8ce4f7d..c0697e3 100644
--- a/DLL_Project/ThingComps/CompLifespanPowered.cs
+++ b/DLL_Project/ThingComps/CompLifespanPowered.cs
@@ -6,7 +6,15 @@ namespace CommunityCoreLibrary
 
     public class CompLifespanPowered : ThingComp
     {
-        
+
+        [Unsaved]
+
+        #region Instance Data
+
+        public int                          remainingTicks = -1;
+
+        #endregion
+
         CompPowerTrader                     CompPowerTrader
         {
             get
@@ -15,8 +23,6 @@ CompPowerTrader                     CompPowerTrader
             }
         }
 
-        public int                          remainingTicks = -1;
-
         public override void                PostSpawnSetup()
         {
             base.PostSpawnSetup();
diff --git a/DLL_Project/ThingComps/CompPowerLowIdleDraw.cs b/DLL_Project/ThingComps/CompPowerLowIdleDraw.cs
index 6bf35cc..0afadad 100644
--- a/DLL_Project/ThingComps/CompPowerLowIdleDraw.cs
+++ b/DLL_Project/ThingComps/CompPowerLowIdleDraw.cs
@@ -9,7 +9,11 @@ namespace CommunityCoreLibrary
     
     public class CompPowerLowIdleDraw : ThingComp
     {
-        
+
+        [Unsaved]
+
+        #region Instance Data
+
         CompPowerTrader                     PowerTrader;
         List<IntVec3>                       scanPosition;
         Pawn                                curUser;
@@ -26,6 +30,10 @@ public class CompPowerLowIdleDraw : ThingComp
 
         CompProperties_LowIdleDraw          IdleProps;
 
+        #endregion
+
+        #region Comp Getters
+
         CompGlower                          CompGlower
         {
             get
@@ -42,6 +50,10 @@ CompPowerTrader                     CompPowerTrader
             }
         }
 
+        #endregion
+
+        #region Query State
+
         public bool                         LowPowerMode
         {
             get
@@ -50,6 +62,8 @@ public bool                         LowPowerMode
             }
         }
 
+        #endregion
+
         public override void                PostExposeData()
         {
 
@@ -356,7 +370,7 @@ void                                BuildScanList()
 
                 if( IdleProps.cycleHighTicks < 0 )
                 {
-                    IdleProps.cycleLowTicks = 500;
+                    IdleProps.cycleHighTicks = 500;
                 }
 
                 //Log.Message( parent.def.defName + " is power cycler " + IdleProps.cycleLowTicks + ":" + IdleProps.cycleHighTicks );
diff --git a/DLL_Project/ThingComps/RestrictedPlacement_Comp.cs b/DLL_Project/ThingComps/RestrictedPlacement_Comp.cs
index bdd5028..edcac2e 100644
--- a/DLL_Project/ThingComps/RestrictedPlacement_Comp.cs
+++ b/DLL_Project/ThingComps/RestrictedPlacement_Comp.cs
@@ -96,18 +96,24 @@ public void                         DoChecks( int ticks )
                 }
             }
 
-            var Restrictions = this.RestrictedPlacement_Properties();
 #if DEBUG
-            if( Restrictions == null )
+            if( 
+                ( PlaceWorkers.Exists( p => p.GetType() == typeof( PlaceWorker_OnlyOnThing ) ) )
+            )
             {
-                Log.Error( "Community Core Library :: RestrictedPlacement_Comp :: " + parent.def.defName + " requires RestrictedPlacement_Properties!" );
-                return;
+                var Restrictions = this.RestrictedPlacement_Properties();
+                if( Restrictions == null )
+                {
+                    Log.Error( "Community Core Library :: RestrictedPlacement_Comp :: " + parent.def.defName + " requires RestrictedPlacement_Properties!" );
+                    return;
+                }
             }
 #endif
 
             // Check on thing
             if( PlaceWorkers.Exists( p => p.GetType() == typeof( PlaceWorker_OnlyOnThing ) ) )
             {
+                var Restrictions = this.RestrictedPlacement_Properties();
                 bool foundThing = false;
                 foreach( Thing t in parent.Position.GetThingList() )
                 {
diff --git a/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/About/About.xml b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/About/About.xml
new file mode 100644
index 0000000..a41b9ff
--- /dev/null
+++ b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/About/About.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ModMetaData>
+
+    <name>Community Core Library - Vanilla Tweaks</name>
+
+    <author>RimWorld CCL Team</author>
+
+    <url>https://ludeon.com/forums/index.php?topic=14172.0</url>
+
+    <targetVersion>Community Core Library v0.12.0</targetVersion>
+
+    <description>Makes optional changes to the core game objects.\n\nUnless a dependant mod has explicitly requested you not to, you should enable this.</description>
+
+</ModMetaData>
\ No newline at end of file
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
new file mode 100644
index 0000000..719c960
--- /dev/null
+++ b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Artillery.xml	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <AdvancedResearchDef>
+
+        <defName>MakeArtilleryShellsSmithingTable</defName>
+        <Priority>0</Priority>
+
+        <researchDefs>
+            <li>Mortars</li>
+        </researchDefs>
+
+        <recipeDefs>
+            <li>MakeArtilleryShellSmithingTable</li>
+        </recipeDefs>
+
+        <thingDefs>
+            <li>TableSmithing</li>
+        </thingDefs>
+
+    </AdvancedResearchDef>
+
+    <AdvancedResearchDef>
+
+        <defName>MakeArtilleryShellsMachiningTable</defName>
+        <Priority>0</Priority>
+
+        <researchDefs>
+            <li>Mortars</li>
+        </researchDefs>
+
+        <recipeDefs>
+            <li>MakeArtilleryShell</li>
+        </recipeDefs>
+
+        <thingDefs>
+            <li>TableMachining</li>
+        </thingDefs>
+
+    </AdvancedResearchDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Plants.xml b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Plants.xml
new file mode 100644
index 0000000..59e416d
--- /dev/null
+++ b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Plants.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <AdvancedResearchDef>
+
+        <defName>PlantHops</defName>
+        <Priority>0</Priority>
+
+        <researchDefs>
+            <li>Brewing</li>
+        </researchDefs>
+
+        <sowTags>
+            <li>Ground</li>
+            <li>Hydroponic</li>
+        </sowTags>
+
+        <thingDefs>
+            <li>PlantHops</li>
+        </thingDefs>
+
+    </AdvancedResearchDef>
+
+    <AdvancedResearchDef>
+
+        <defName>PlantXerigium</defName>
+        <Priority>0</Priority>
+
+        <researchDefs>
+            <li>HospitalBed</li>
+        </researchDefs>
+
+        <sowTags>
+            <li>Ground</li>
+            <li>Hydroponic</li>
+        </sowTags>
+
+        <thingDefs>
+            <li>PlantXerigium</li>
+        </thingDefs>
+
+    </AdvancedResearchDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/ModHelperDefs/ModHelper_Core.xml b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/ModHelperDefs/ModHelper_Core.xml
new file mode 100644
index 0000000..eb8359f
--- /dev/null
+++ b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/ModHelperDefs/ModHelper_Core.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <ModHelperDef>
+        <defName>CommunityCoreLibrary</defName>
+        
+        <ModName>Community Core Library</ModName>
+        
+        <version>0.12.0</version>
+        
+        <MapComponents>
+            <li>CommunityCoreLibrary.ResearchController</li>
+        </MapComponents>
+        
+    </ModHelperDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/RecipeDefs/Recipes_ArtilleryShells.xml b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/RecipeDefs/Recipes_ArtilleryShells.xml
new file mode 100644
index 0000000..5a621c2
--- /dev/null
+++ b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/RecipeDefs/Recipes_ArtilleryShells.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <RecipeDef>
+        <defName>MakeArtilleryShellSmithingTable</defName>
+        <label>make artillery shell</label>
+        <description>Craft an artillery shell.</description>
+        <jobString>Making artillery shell.</jobString>
+        <workSpeedStat>SmithingSpeed</workSpeedStat>
+        <effectWorking>Cook</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <allowMixingIngredients>true</allowMixingIngredients>
+        <workAmount>1200</workAmount>
+        <targetCountAdjustment>5</targetCountAdjustment>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Steel</li>
+                    </thingDefs>
+                </filter>
+                <count>10</count>
+            </li>
+        </ingredients>
+        <fixedIngredientFilter>
+            <thingDefs>
+                <li>Steel</li>
+            </thingDefs>
+        </fixedIngredientFilter>
+        <products>
+            <ArtilleryShell>1</ArtilleryShell>
+        </products>
+        <workSkill>Crafting</workSkill>
+    </RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Lights.xml b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Lights.xml
new file mode 100644
index 0000000..7ab92f5
--- /dev/null
+++ b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Lights.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Defs>
+
+    <ThingDef Name="BuildingBase" Abstract="True">
+        <category>Building</category>
+        <thingClass>Building</thingClass>
+        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
+        <selectable>true</selectable>
+        <drawerType>MapMeshAndRealTime</drawerType>
+        <terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
+        <repairEffect>Repair</repairEffect>
+        <leaveResourcesWhenKilled>true</leaveResourcesWhenKilled>
+        <filthLeaving>BuildingRubble</filthLeaving>
+    </ThingDef>
+
+    <ThingDef Abstract="True" Name="StandingLampBase" ParentName="BuildingBase">
+        <thingClass>Building</thingClass>
+        <category>Building</category>
+        <minifiedDef>MinifiedFurniture</minifiedDef>
+        <altitudeLayer>Waist</altitudeLayer>
+        <passability>PassThroughOnly</passability>
+        <selectable>true</selectable>
+        <fillPercent>0.20</fillPercent>
+        <costList>
+            <Steel>15</Steel>
+        </costList>
+        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
+        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
+        <designationCategory>Furniture</designationCategory>
+        <rotatable>false</rotatable>
+        <graphicData>
+            <texPath>Things/Building/Furniture/LampStanding</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+            <shadowData>
+                <volume>(0.3, 0.6, 0.3)</volume>
+                <offset>(0,0,-0.1)</offset>
+            </shadowData>
+        </graphicData>
+        <comps>
+            <li>
+                <compClass>CompPowerTrader</compClass>
+                <basePowerConsumption>150</basePowerConsumption>
+                <shortCircuitInRain>false</shortCircuitInRain>
+                <soundPowerOn>PowerOnSmall</soundPowerOn>
+                <soundPowerOff>PowerOffSmall</soundPowerOff>
+            </li>
+            <li>
+                <compClass>CompQuality</compClass>
+            </li>
+            <li>
+                <compClass>CompGlower</compClass>
+                <glowRadius>12</glowRadius>
+                <glowColor>(217,217,208,0)</glowColor>
+            </li>
+            <li Class="CommunityCoreLibrary.CompProperties_ColoredLight">
+                <compClass>CommunityCoreLibrary.CompColoredLight</compClass>
+            </li>
+        </comps>
+        <statBases>
+            <MaxHitPoints>50</MaxHitPoints>
+            <WorkToMake>170</WorkToMake>
+            <Flammability>1.0</Flammability>
+        </statBases>
+    </ThingDef>
+
+
+    <ThingDef ParentName="StandingLampBase" >
+        <defName>StandingLamp</defName>
+        <label>standing lamp</label>
+        <description>Standing lamp that lights an area.</description>
+        <designationHotKey>L</designationHotKey>
+    </ThingDef>
+
+    <ThingDef ParentName="StandingLampBase">
+        <defName>StandingLamp_Red</defName>
+        <label>standing lamp (red)</label>
+        <designationHotKey>O</designationHotKey>
+        <description>Standing lamp that lights an area in red.</description>
+        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
+    </ThingDef>
+
+    <ThingDef ParentName="StandingLampBase">
+        <defName>StandingLamp_Green</defName>
+        <label>standing lamp (green)</label>
+        <description>Standing lamp that lights an area in green.</description>
+        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
+    </ThingDef>
+
+    <ThingDef ParentName="StandingLampBase">
+        <defName>StandingLamp_Blue</defName>
+        <label>standing lamp (blue)</label>
+        <description>Standing lamp that lights an area in blue.</description>
+        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
+    </ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Buildings_Production.xml b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Production.xml
similarity index 90%
rename from _Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Buildings_Production.xml
rename to _Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Production.xml
index 4d79654..b314b06 100644
--- a/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Buildings_Production.xml	
+++ b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Production.xml	
@@ -23,14 +23,13 @@
         </graphicData>
         <altitudeLayer>BuildingTall</altitudeLayer>
         <passability>Impassable</passability>
-        <castEdgeShadows>true</castEdgeShadows>
         <fillPercent>1</fillPercent>
         <statBases>
             <WorkToMake>2200</WorkToMake>
             <MaxHitPoints>350</MaxHitPoints>
             <Flammability>1.0</Flammability>
         </statBases>
-        <description>Synthesizes nutrient paste from organic feedstocks. It consumes less ingredients and time than any other meal production method - but nobody likes eating nutrient paste.</description>
+        <description>Synthesizes nutrient paste from organic feedstocks. It consumes less ingredients and time than any other meal production method - but nobody likes eating nutrient paste. Accepts raw food, but not rough plant matter like hay.</description>
         <building>
             <isMealSource>true</isMealSource>
             <wantsHopperAdjacent>true</wantsHopperAdjacent>
@@ -59,20 +58,24 @@
         <hasInteractionCell>true</hasInteractionCell>
         <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
         <designationCategory>Production</designationCategory>
-        <staticSunShadowHeight>0.75</staticSunShadowHeight>
         <constructEffect>ConstructMetal</constructEffect>
         <designationHotKey>N</designationHotKey>
     </ThingDef>
 
-    <ThingDef ParentName="BuildingBase">
+    <ThingDef Name="BenchBase" ParentName="BuildingBase" Abstract="True">
+        <castEdgeShadows>true</castEdgeShadows>
+        <staticSunShadowHeight>0.20</staticSunShadowHeight>
+    </ThingDef>
+
+    <ThingDef ParentName="BenchBase">
         <DefName>TableTailor</DefName>
         <label>tailor's workbench</label>
         <ThingClass>Building_WorkTable</ThingClass>
         <Description>A workbench equipped for cloth refinement and clothing production.</Description>
         <graphicData>
             <texPath>Things/Building/Production/TableTailor</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <drawSize>(3,1)</drawSize>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(3.5,1.5)</drawSize>
         </graphicData>
         <costStuffCount>75</costStuffCount>
         <CostList>
@@ -112,22 +115,31 @@
                 <soundPowerOn>PowerOnSmall</soundPowerOn>
                 <soundPowerOff>PowerOffSmall</soundPowerOff>
             </li>
+            <li>
+                <compClass>CompAffectedByFacilities</compClass>
+                <linkableFacilities>
+                    <li>ToolCabinet</li>
+                </linkableFacilities>
+            </li>
             <li Class="CommunityCoreLibrary.CompProperties_LowIdleDraw">
                 <compClass>CommunityCoreLibrary.CompPowerLowIdleDraw</compClass>
             </li>
         </comps>
         <designationHotKey>P</designationHotKey>
+        <placeWorkers>
+            <li>PlaceWorker_ShowFacilitiesConnections</li>
+        </placeWorkers>
     </ThingDef>
 
-    <ThingDef ParentName="BuildingBase">
+    <ThingDef ParentName="BenchBase">
         <DefName>TableSmithing</DefName>
         <label>smithing bench</label>
         <ThingClass>Building_WorkTable</ThingClass>
         <Description>A workbench equipped for weapons and tools production.</Description>
         <graphicData>
             <texPath>Things/Building/Production/TableSmithing</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <drawSize>(3,1)</drawSize>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(3.5,1.5)</drawSize>
         </graphicData>
         <CostList>
             <WoodLog>40</WoodLog>
@@ -141,6 +153,7 @@
             <WorkToMake>3000</WorkToMake>
             <MaxHitPoints>180</MaxHitPoints>
             <Flammability>1.0</Flammability>
+            <Cleanliness>-3</Cleanliness>
         </statBases>
         <Size>(3,1)</Size>
         <DesignationCategory>Production</DesignationCategory>
@@ -164,6 +177,12 @@
                 <soundPowerOn>PowerOnSmall</soundPowerOn>
                 <soundPowerOff>PowerOffSmall</soundPowerOff>
             </li>
+            <li>
+                <compClass>CompAffectedByFacilities</compClass>
+                <linkableFacilities>
+                    <li>ToolCabinet</li>
+                </linkableFacilities>
+            </li>
             <li Class="CommunityCoreLibrary.CompProperties_LowIdleDraw">
                 <compClass>CommunityCoreLibrary.CompPowerLowIdleDraw</compClass>
             </li>
@@ -174,17 +193,20 @@
             </li>
         </comps>
         <designationHotKey>M</designationHotKey>
+        <placeWorkers>
+            <li>PlaceWorker_ShowFacilitiesConnections</li>
+        </placeWorkers>
     </ThingDef>
 
-    <ThingDef ParentName="BuildingBase">
+    <ThingDef ParentName="BenchBase">
         <DefName>TableMachining</DefName>
         <label>machining table</label>
         <ThingClass>Building_WorkTable</ThingClass>
         <Description>A table and tools for assembling and disassembling machine components like mechanoids bodies and ammunition.</Description>
         <graphicData>
             <texPath>Things/Building/Production/TableMachining</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <drawSize>(3,1)</drawSize>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(3.5,1.5)</drawSize>
         </graphicData>
         <CostList>
             <Steel>150</Steel>
@@ -196,6 +218,7 @@
             <WorkToMake>3000</WorkToMake>
             <MaxHitPoints>180</MaxHitPoints>
             <Flammability>1.0</Flammability>
+            <Cleanliness>-2</Cleanliness>
         </statBases>
         <Size>(3,1)</Size>
         <DesignationCategory>Production</DesignationCategory>
@@ -211,6 +234,7 @@
         <inspectorTabs>
             <li>ITab_Bills</li>
         </inspectorTabs>
+        <tickerType>Normal</tickerType>
         <comps>
             <li>
                 <compClass>CompPowerTrader</compClass>
@@ -227,25 +251,33 @@
                 <glowRadius>5</glowRadius>
                 <glowColor>(73,123,138,0)</glowColor>
             </li>
+            <li>
+                <compClass>CompAffectedByFacilities</compClass>
+                <linkableFacilities>
+                    <li>ToolCabinet</li>
+                </linkableFacilities>
+            </li>
         </comps>
         <building>
             <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
         </building>
-        <tickerType>Normal</tickerType>
         <constructEffect>ConstructMetal</constructEffect>
         <researchPrerequisite>Machining</researchPrerequisite>
         <designationHotKey>I</designationHotKey>
+        <placeWorkers>
+            <li>PlaceWorker_ShowFacilitiesConnections</li>
+        </placeWorkers>
     </ThingDef>
 
-    <ThingDef ParentName="BuildingBase">
+    <ThingDef ParentName="BenchBase">
         <defName>CookStove</defName>
         <label>cook stove</label>
         <ThingClass>Building_WorkTable_HeatPush</ThingClass>
         <Description>A simple stove and attached countertop for preparing meals.</Description>
         <graphicData>
             <texPath>Things/Building/Production/TableCookStove</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <drawSize>(3,1)</drawSize>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(3.5,1.5)</drawSize>
         </graphicData>
         <constructEffect>ConstructMetal</constructEffect>
         <CostList>
@@ -274,6 +306,7 @@
         <inspectorTabs>
             <li>ITab_Bills</li>
         </inspectorTabs>
+        <tickerType>Normal</tickerType>
         <comps>
             <li>
                 <compClass>CompPowerTrader</compClass>
@@ -296,19 +329,18 @@
             <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
             <heatPerTickWhileWorking>0.25</heatPerTickWhileWorking>
         </building>
-        <tickerType>Normal</tickerType>
         <designationHotKey>O</designationHotKey>
     </ThingDef>
 
-    <ThingDef ParentName="BuildingBase">
+    <ThingDef ParentName="BenchBase">
         <DefName>ElectricSmelter</DefName>
         <label>electric smelter</label>
         <ThingClass>Building_WorkTable_HeatPush</ThingClass>
         <Description>Extracts usable metal from slag chunks and other mixed metal items. Consumes a lot of power.</Description>
         <graphicData>
             <texPath>Things/Building/Production/ElectricSmelter</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <drawSize>(3,1)</drawSize>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(3.5,1.5)</drawSize>
         </graphicData>
         <constructEffect>ConstructMetal</constructEffect>
         <CostList>
@@ -336,6 +368,7 @@
         <inspectorTabs>
             <li>ITab_Bills</li>
         </inspectorTabs>
+        <tickerType>Normal</tickerType>
         <comps>
             <li>
                 <compClass>CompPowerTrader</compClass>
@@ -360,7 +393,6 @@
             <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
             <heatPerTickWhileWorking>0.5</heatPerTickWhileWorking>
         </building>
-        <tickerType>Normal</tickerType>
         <researchPrerequisite>ElectricSmelting</researchPrerequisite>
         <designationHotKey>L</designationHotKey>
     </ThingDef>
@@ -389,6 +421,7 @@
             <WorkToMake>4500</WorkToMake>
             <MaxHitPoints>300</MaxHitPoints>
             <Flammability>0</Flammability>
+            <Cleanliness>-20</Cleanliness>
         </statBases>
         <Size>(3,2)</Size>
         <DesignationCategory>Production</DesignationCategory>
@@ -404,6 +437,7 @@
         <inspectorTabs>
             <li>ITab_Bills</li>
         </inspectorTabs>
+        <tickerType>Normal</tickerType>
         <comps>
             <li>
                 <compClass>CompPowerTrader</compClass>
@@ -430,7 +464,6 @@
             <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
             <heatPerTickWhileWorking>0.6</heatPerTickWhileWorking>
         </building>
-        <tickerType>Normal</tickerType>
         <researchPrerequisite>Cremation</researchPrerequisite>
         <designationHotKey>K</designationHotKey>
     </ThingDef>
@@ -451,10 +484,12 @@
         <pathCost>60</pathCost>
         <castEdgeShadows>true</castEdgeShadows>
         <constructEffect>ConstructMetal</constructEffect>
+        <fillPercent>0.30</fillPercent>
         <statBases>
             <WorkToMake>2800</WorkToMake>
             <MaxHitPoints>180</MaxHitPoints>
             <Flammability>1.0</Flammability>
+            <Cleanliness>-3</Cleanliness>
         </statBases>
         <description>For growing food. Hydroponics basins grow a few plants quickly. The basin requires power to work, and plants will die if power is cut.</description>
         <size>(1,4)</size>
@@ -493,7 +528,6 @@
         <researchPrerequisite>Hydroponics</researchPrerequisite>
         <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
         <designationCategory>Production</designationCategory>
-        <!--<staticSunShadowHeight>0.03</staticSunShadowHeight>-->
         <designationHotKey>Y</designationHotKey>
     </ThingDef>
 
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Buildings_Structure.xml b/_Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Structure.xml
similarity index 100%
rename from _Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Buildings_Structure.xml
rename to _Mod/Modders Resource/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Structure.xml
diff --git a/_Mod/Modders Resource/Community Core Library/About/About.xml b/_Mod/Modders Resource/Community Core Library/About/About.xml
index f70669e..e79a0f2 100644
--- a/_Mod/Modders Resource/Community Core Library/About/About.xml	
+++ b/_Mod/Modders Resource/Community Core Library/About/About.xml	
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
-    <name>Community Core Library v0.11.5</name>
+
+    <name>Community Core Library v0.12.0</name>
+
     <author>RimWorld CCL Team</author>
+
     <url>https://ludeon.com/forums/index.php?topic=14172.0</url>
-    <targetVersion>RimWorld Alpha 11d</targetVersion>
-    <description>Provides a common core set of library functions for modders as well as making the necessary core compatibility changes.\n\nThis is the modders build release, it has robust error checking to help you find problems with your CCL based mod.</description>
+
+    <targetVersion>RimWorld Alpha 12</targetVersion>
+
+    <description>Provides a common core set of library functions for modders as well as making required core changes.\n\nThis must be loaded immediately after "Core" unless another mod explicitly tells you to load it between "Core" this mod.</description>
+
 </ModMetaData>
\ No newline at end of file
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 de51822..ff1f149 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/Community Core Library/Defs/AdvancedResearchDefs/AdvancedResearch_Core.xml b/_Mod/Modders Resource/Community Core Library/Defs/AdvancedResearchDefs/AdvancedResearch_Core.xml
deleted file mode 100644
index dd40a93..0000000
--- a/_Mod/Modders Resource/Community Core Library/Defs/AdvancedResearchDefs/AdvancedResearch_Core.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] Some unique identifier in class
-        <Priority>int</Priority>        [required] Lower values is happen first
-        
-        <researchDefs>                  [required] All the research listed must be complete for anything to happen
-            <li>ResearchProjectDef</li>
-        </researchDefs>
-        
-        <HideDefs>bool</HideDefs>       [optional: false] Set to true to disable (hide) or false to enable
-        
-        <recipeDefs>                    [optional: null] Recipes to toggle on buildings, requires <thingDefs>
-            <li>RecipeDef</li>          with <thingClass> implementing "IBillGiver"
-        </recipeDef>
-        
-        <sowTags>                       [optional: null] Plant sowTags to toggle, requires <thingDefs> with
-            <li>string</li>             <thingClass> "Plant"
-        </sowTags>
-        
-        <thingsDefs>                    [optional: null] The things to effect depending on other tags,
-            <li>ThingDef</li>           If no other dependant tags exist, toggles buildings in the architect tabs
-        </thingDefs>                    with a valid <designationCategory> (must not be null or "None")
-        
-        <effectedResearchDefs>          [optional: null] Research projects to unlock or lock, can be used to
-            <li>ResearchProjectDef</li> create exclusive branches of research
-        </effectedResearchDefs>
-        
-        <researchMods>                  [optional: null] Mod callback Actions, these will happen after everything else has been processed
-            <li>Action</li>
-        </researchMods>
-    -->
-
-    <AdvancedResearchDef>
-
-        <defName>MakeArtilleryShells</defName>
-        <Priority>0</Priority>
-
-        <researchDefs>
-            <li>Mortars</li>
-            <li>Machining</li>
-        </researchDefs>
-
-        <recipeDefs>
-            <li>MakeArtilleryShell</li>
-        </recipeDefs>
-
-        <thingDefs>
-            <li>TableMachining</li>
-        </thingDefs>
-
-    </AdvancedResearchDef>
-
-    <AdvancedResearchDef>
-
-        <defName>PlantHops</defName>
-        <Priority>0</Priority>
-
-        <researchDefs>
-            <li>Brewing</li>
-        </researchDefs>
-
-        <sowTags>
-            <li>Ground</li>
-            <li>Hydroponic</li>
-        </sowTags>
-
-        <thingDefs>
-            <li>PlantHops</li>
-        </thingDefs>
-
-    </AdvancedResearchDef>
-
-    <AdvancedResearchDef>
-
-        <defName>PlantXerigium</defName>
-        <Priority>0</Priority>
-
-        <researchDefs>
-            <li>HospitalBed</li>
-        </researchDefs>
-
-        <sowTags>
-            <li>Ground</li>
-            <li>Hydroponic</li>
-        </sowTags>
-
-        <thingDefs>
-            <li>PlantXerigium</li>
-        </thingDefs>
-
-    </AdvancedResearchDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/CCLVersionDefs/CCLVersion.xml b/_Mod/Modders Resource/Community Core Library/Defs/CCLVersionDefs/CCLVersion.xml
deleted file mode 100644
index 5373e79..0000000
--- a/_Mod/Modders Resource/Community Core Library/Defs/CCLVersionDefs/CCLVersion.xml	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] SomeUniqueIdentifierInClass
-        
-        <ModName>string</ModName>       [required] Name of your mod
-        
-        <version>version</version>      [required] Minimum version of CCL required
-    -->
-
-    <CCLVersionDef>
-        <defName>CCLVersion</defName>
-        <ModName>Community Core Library</ModName>
-        <version>0.11.5</version>
-    </CCLVersionDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/HelpCategoryDefs/HelpCategoryDefs.xml b/_Mod/Modders Resource/Community Core Library/Defs/HelpCategoryDefs/HelpCategoryDefs.xml
deleted file mode 100644
index a7b6559..0000000
--- a/_Mod/Modders Resource/Community Core Library/Defs/HelpCategoryDefs/HelpCategoryDefs.xml	
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] Some unique identifier in class
-        
-        <ModName>string</ModName>       [required] Name of associated mod
-        
-        <label>string</label>           [required] Title of help section within mod
-        
-    -->
-
-    <HelpCategoryDef>
-        <defName>CCLGizmoHelp</defName>
-        <ModName>Community Core Library</ModName>
-        <label>Gizmos</label>
-    </HelpCategoryDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/HelpCategoryDefs/HelpCategory_Gizmos.xml b/_Mod/Modders Resource/Community Core Library/Defs/HelpCategoryDefs/HelpCategory_Gizmos.xml
new file mode 100644
index 0000000..6148935
--- /dev/null
+++ b/_Mod/Modders Resource/Community Core Library/Defs/HelpCategoryDefs/HelpCategory_Gizmos.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <HelpCategoryDef>
+
+        <defName>GizmoHelp</defName>
+
+        <ModName>Community Core Library</ModName>
+
+        <label>Gizmos</label>
+
+    </HelpCategoryDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Defs/HelpDefs/HelpDefs.xml b/_Mod/Modders Resource/Community Core Library/Defs/HelpDefs/HelpDefs_Gizmos.xml
similarity index 53%
rename from _Mod/User Release/Community Core Library/Defs/HelpDefs/HelpDefs.xml
rename to _Mod/Modders Resource/Community Core Library/Defs/HelpDefs/HelpDefs_Gizmos.xml
index dfffb1f..08eb4b2 100644
--- a/_Mod/User Release/Community Core Library/Defs/HelpDefs/HelpDefs.xml	
+++ b/_Mod/Modders Resource/Community Core Library/Defs/HelpDefs/HelpDefs_Gizmos.xml	
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-    <!--
-        <defName>string</defName>       [required] Some unique identifier in class
-        
-        <category>string</category>     [required] defName of category help topic
-        
-        <label>string</label>           [required] Title of help topic
-        
-        <description>string</description> [required] Information to tell the player
-    -->
-
     <HelpDef>
-        <defName>CCLColoredLights</defName>
-        <category>CCLGizmoHelp</category>
+        <defName>ColoredLights</defName>
+
+        <category>GizmoHelp</category>
+
         <label>Colored Lights</label>
+
         <description>Buildings which support colored lights will offer buttons to change the light color as well as share the color with other lights when the appropriate research is complete.</description>
+
     </HelpDef>
 
     <HelpDef>
-        <defName>CCLNeighbourlyGrowers</defName>
-        <category>CCLGizmoHelp</category>
+        <defName>NeighbourlyGrowers</defName>
+
+        <category>GizmoHelp</category>
+
         <label>Neighbourly Growers</label>
+
         <description>Hydroponics which are neighbourly growers support sharing the sowed plant with other neighbourly growers allowing you to set one building and then use a button to share it.</description>
+
     </HelpDef>
 
 </Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/MainTabDefs/MainTabs.xml b/_Mod/Modders Resource/Community Core Library/Defs/MainTabDefs/MainTabs.xml
new file mode 100644
index 0000000..ae296d3
--- /dev/null
+++ b/_Mod/Modders Resource/Community Core Library/Defs/MainTabDefs/MainTabs.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MainTabDefs>
+    
+  <MainTabDef Class="CommunityCoreLibrary.MainTab_HelpMenuDef">
+    <defName>CCL_ModHelp</defName>
+    <label>Help</label>
+    <description>Get help with different mods.</description>
+    <windowClass>CommunityCoreLibrary.MainTabWindow_ModHelp</windowClass>
+    <order>81</order>
+    <windowSize>(700,500)</windowSize>
+    <listWidth>200</listWidth>
+    <pauseGame>false</pauseGame>
+  </MainTabDef>
+
+</MainTabDefs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/ModHelperDefs/ModHelper.xml b/_Mod/Modders Resource/Community Core Library/Defs/ModHelperDefs/ModHelper.xml
new file mode 100644
index 0000000..92a3c96
--- /dev/null
+++ b/_Mod/Modders Resource/Community Core Library/Defs/ModHelperDefs/ModHelper.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <ModHelperDef>
+        <defName>CommunityCoreLibrary</defName>
+
+        <ModName>Community Core Library</ModName>
+
+        <version>0.12.0</version>
+
+        <MapComponents>
+            <li>CommunityCoreLibrary.ResearchController</li>
+        </MapComponents>
+
+    </ModHelperDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/ResearchProjectDefs/Research_Locker.xml b/_Mod/Modders Resource/Community Core Library/Defs/ResearchProjectDefs/Research_Locker.xml
index 1434027..825cfe0 100644
--- a/_Mod/Modders Resource/Community Core Library/Defs/ResearchProjectDefs/Research_Locker.xml	
+++ b/_Mod/Modders Resource/Community Core Library/Defs/ResearchProjectDefs/Research_Locker.xml	
@@ -3,13 +3,17 @@
 
     <ResearchProjectDef>
         <defName>CommunityCoreLibraryResearchLocker</defName>
-        <label>this should be hidden</label>
-        <description>This should never be seen.</description>
-        <descriptionDiscovered>How did it come to this?</descriptionDiscovered>
+
+        <label>.</label>
+        <description>.</description>
+        <descriptionDiscovered>?</descriptionDiscovered>
+
         <totalCost>1</totalCost>
+
         <prerequisites>
             <li>CommunityCoreLibraryResearchLocker</li>
         </prerequisites>
+
     </ResearchProjectDef>
 
 </Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Buildings_Lights.xml b/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Buildings_Lights.xml
deleted file mode 100644
index e4e7867..0000000
--- a/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Buildings_Lights.xml	
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Defs>
-
-    <ThingDef Name="BuildingBase" Abstract="True">
-        <category>Building</category>
-        <thingClass>Building</thingClass>
-        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
-        <selectable>true</selectable>
-        <drawerType>MapMeshAndRealTime</drawerType>
-        <terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
-        <repairEffect>Repair</repairEffect>
-        <leaveResourcesWhenKilled>true</leaveResourcesWhenKilled>
-        <filthLeaving>BuildingRubble</filthLeaving>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>StandingLamp</defName>
-        <label>standing lamp</label>
-        <thingClass>Building</thingClass>
-        <category>Building</category>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>115</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Standing lamp that lights an area.</description>
-        <costList>
-            <Steel>15</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
-        <comps>
-            <li>
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>150</basePowerConsumption>
-                <shortCircuitInRain>false</shortCircuitInRain>
-                <soundPowerOn>PowerOnSmall</soundPowerOn>
-                <soundPowerOff>PowerOffSmall</soundPowerOff>
-            </li>
-            <li>
-                <compClass>CompGlower</compClass>
-                <glowRadius>12</glowRadius>
-                <glowColor>(217,217,208,0)</glowColor>
-            </li>
-            <li Class="CommunityCoreLibrary.CompProperties_ColoredLight">
-                <compClass>CommunityCoreLibrary.CompColoredLight</compClass>
-            </li>
-        </comps>
-        <designationCategory>Furniture</designationCategory>
-        <rotatable>false</rotatable>
-        <designationHotKey>L</designationHotKey>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>StandingLamp_Red</defName>
-        <label>standing lamp (red)</label>
-        <thingClass>Building</thingClass>
-        <category>Building</category>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>130</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Standing lamp that lights an area in red.</description>
-        <costList>
-            <Steel>15</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <comps>
-            <li>
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>150</basePowerConsumption>
-                <shortCircuitInRain>false</shortCircuitInRain>
-                <soundPowerOn>PowerOnSmall</soundPowerOn>
-                <soundPowerOff>PowerOffSmall</soundPowerOff>
-            </li>
-            <li>
-                <compClass>CompGlower</compClass>
-                <glowRadius>12</glowRadius>
-                <glowColor>(217,0,0,0)</glowColor>
-            </li>
-        </comps>
-        <designationCategory>None</designationCategory>
-        <rotatable>false</rotatable>
-        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>StandingLamp_Green</defName>
-        <label>standing lamp (green)</label>
-        <thingClass>Building</thingClass>
-        <category>Building</category>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>130</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Standing lamp that lights an area in green.</description>
-        <costList>
-            <Steel>15</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <comps>
-            <li>
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>150</basePowerConsumption>
-                <shortCircuitInRain>false</shortCircuitInRain>
-                <soundPowerOn>PowerOnSmall</soundPowerOn>
-                <soundPowerOff>PowerOffSmall</soundPowerOff>
-            </li>
-            <li>
-                <compClass>CompGlower</compClass>
-                <glowRadius>12</glowRadius>
-                <glowColor>(0,217,0,0)</glowColor>
-            </li>
-        </comps>
-        <designationCategory>None</designationCategory>
-        <rotatable>false</rotatable>
-        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>StandingLamp_Blue</defName>
-        <label>standing lamp (blue)</label>
-        <thingClass>Building</thingClass>
-        <category>Building</category>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>130</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Standing lamp that lights an area in blue.</description>
-        <costList>
-            <Steel>15</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <comps>
-            <li>
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>150</basePowerConsumption>
-                <shortCircuitInRain>false</shortCircuitInRain>
-                <soundPowerOn>PowerOnSmall</soundPowerOn>
-                <soundPowerOff>PowerOffSmall</soundPowerOff>
-            </li>
-            <li>
-                <compClass>CompGlower</compClass>
-                <glowRadius>12</glowRadius>
-                <glowColor>(0,0,217,0)</glowColor>
-            </li>
-        </comps>
-        <designationCategory>None</designationCategory>
-        <rotatable>false</rotatable>
-        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
-    </ThingDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/CCL_Init.xml b/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/CCL_Init.xml
index 6d1d04f..28f7587 100644
--- a/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/CCL_Init.xml	
+++ b/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/CCL_Init.xml	
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-	<ThingDef>
-		<defName>CCLInit</defName>
-		<category>Building</category>
-		<menuHidden>true</menuHidden>
-		<label>CCLInitializer</label>
-		<thingClass>Thing</thingClass>
-		<inspectorTabs>
-			<li>CommunityCoreLibrary.ModInit</li>
-		</inspectorTabs>
-	</ThingDef>
+    <ThingDef>
+        <defName>CCLInit</defName>
+        <category>Building</category>
+        <menuHidden>true</menuHidden>
+        <label>CCLInitializer</label>
+        <thingClass>Thing</thingClass>
+        <inspectorTabs>
+            <li>CommunityCoreLibrary.ModInit</li>
+        </inspectorTabs>
+    </ThingDef>
 
 </Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Buildings_Power.xml b/_Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Geothermal_Override.xml
similarity index 100%
rename from _Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Buildings_Power.xml
rename to _Mod/Modders Resource/Community Core Library/Defs/ThingDefs/Geothermal_Override.xml
diff --git a/_Mod/Modders Resource/Community Core Library/Languages/English/Keyed/PlaceWorkers.xml b/_Mod/Modders Resource/Community Core Library/Languages/English/Keyed/PlaceWorkers.xml
index 5148d97..99d276e 100644
--- a/_Mod/Modders Resource/Community Core Library/Languages/English/Keyed/PlaceWorkers.xml	
+++ b/_Mod/Modders Resource/Community Core Library/Languages/English/Keyed/PlaceWorkers.xml	
@@ -5,10 +5,10 @@
     <MessagePlacementItemSurface>Must be placed on an item surface!</MessagePlacementItemSurface>
     <MessagePlacementMustBeUnderRoof>Must be placed under a roof!</MessagePlacementMustBeUnderRoof>
     <MessagePlacementAgainstSupport>Must place against a supporting structure!</MessagePlacementAgainstSupport>
-    <MessagePlacementCountRestricted>Can not have more than: </MessagePlacementCountRestricted>
-    <MessagePlacementNotOn>You can not place that on </MessagePlacementNotOn>
-    <MessagePlacementNotHere>You can not place that here!</MessagePlacementNotHere>
+    <MessagePlacementCountRestricted>Cannot have more than: </MessagePlacementCountRestricted>
+    <MessagePlacementNotOn>You cannot place that on </MessagePlacementNotOn>
+    <MessagePlacementNotHere>You cannot place that here!</MessagePlacementNotHere>
     <AlertPlaceWorkerRestrictionSupportRemovedLabel>A support was removed!</AlertPlaceWorkerRestrictionSupportRemovedLabel>
-    <AlertPlaceWorkerRestrictionSupportRemovedDesc>Something has been destroyed because it's support has been removed or destroyed!\n\nThe following things have been destroyed because their supports are missing:</AlertPlaceWorkerRestrictionSupportRemovedDesc>
+    <AlertPlaceWorkerRestrictionSupportRemovedDesc>Something has been destroyed because its support has been removed or destroyed!\n\nThe following things have been destroyed because their supports are missing:</AlertPlaceWorkerRestrictionSupportRemovedDesc>
     
 </LanguageData>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Languages/English/Keyed/UI_Elements.xml b/_Mod/Modders Resource/Community Core Library/Languages/English/Keyed/UI_Elements.xml
index 49b241f..bfd332c 100644
--- a/_Mod/Modders Resource/Community Core Library/Languages/English/Keyed/UI_Elements.xml	
+++ b/_Mod/Modders Resource/Community Core Library/Languages/English/Keyed/UI_Elements.xml	
@@ -8,23 +8,23 @@
   <CommandChangeColorLabel>Change color</CommandChangeColorLabel>
   <CommandChangeColorDesc>LClick - {0};\nRClick - {1}</CommandChangeColorDesc>
 
-  <CommandChangeRoommateColorLabel>Syncronize colorable lights in room</CommandChangeRoommateColorLabel>
+  <CommandChangeRoommateColorLabel>Synchronize colorable lights in room</CommandChangeRoommateColorLabel>
   <CommandChangeRoommateColorLClick>LClick - Only {0}</CommandChangeRoommateColorLClick>
   <CommandChangeRoommateColorRClick>RClick - All lights</CommandChangeRoommateColorRClick>
 
-  <CommandChangeTouchingPlantLabel>Syncronize all touching plant growers</CommandChangeTouchingPlantLabel>
-  <CommandChangeRoommatePlantLabel>Syncronize plant growers in room</CommandChangeRoommatePlantLabel>
+  <CommandChangeTouchingPlantLabel>Synchronize all touching plant growers</CommandChangeTouchingPlantLabel>
+  <CommandChangeRoommatePlantLabel>Synchronize plant growers in room</CommandChangeRoommatePlantLabel>
   <CommandChangeRoommatePlantLClick>LClick - Only {0}</CommandChangeRoommatePlantLClick>
   <CommandChangeRoommatePlantRClick>RClick - All growers</CommandChangeRoommatePlantRClick>
 
   <CommandGroupOfThingsLClick>LClick - In room</CommandGroupOfThingsLClick>
   <CommandGroupOfThingsRClick>RClick - On map</CommandGroupOfThingsRClick>
 
-  <CommandGroupOfThingsByDefLabel>Syncronize all touching {0}</CommandGroupOfThingsByDefLabel>
-  <CommandGroupOfThingsByLinkerLabel>Syncronize all linked {0}</CommandGroupOfThingsByLinkerLabel>
+  <CommandGroupOfThingsByDefLabel>Synchronize all touching {0}</CommandGroupOfThingsByDefLabel>
+  <CommandGroupOfThingsByLinkerLabel>Synchronize all linked {0}</CommandGroupOfThingsByLinkerLabel>
 
-  <CommandGroupOfThingsByDefInRoomLabel>Syncronize all {0} in room</CommandGroupOfThingsByDefInRoomLabel>
-  <CommandGroupOfThingsByLinkerInRoomLabel>Syncronize all linked {0} in room</CommandGroupOfThingsByLinkerInRoomLabel>
+  <CommandGroupOfThingsByDefInRoomLabel>Synchronize all {0} in room</CommandGroupOfThingsByDefInRoomLabel>
+  <CommandGroupOfThingsByLinkerInRoomLabel>Synchronize all linked {0} in room</CommandGroupOfThingsByLinkerInRoomLabel>
 
   <HelpOTabTitle>Mod Help</HelpOTabTitle>
   <NoHelpDefs>No help defs found</NoHelpDefs>
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/Defs/AdvancedResearchDefs/Advanced_Ancient_Tech.xml b/_Mod/Modders Resource/Def Descriptions/AdvancedResearchDefs/AdvancedResearchDef.xml
similarity index 71%
rename from _Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/Defs/AdvancedResearchDefs/Advanced_Ancient_Tech.xml
rename to _Mod/Modders Resource/Def Descriptions/AdvancedResearchDefs/AdvancedResearchDef.xml
index 6d4ff62..b057cab 100644
--- a/_Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/Defs/AdvancedResearchDefs/Advanced_Ancient_Tech.xml	
+++ b/_Mod/Modders Resource/Def Descriptions/AdvancedResearchDefs/AdvancedResearchDef.xml	
@@ -2,7 +2,11 @@
 <Defs>
 
     <!--
+
+    <AdvancedResearchDef>
+    
         <defName>string</defName>       [required] Some unique identifier in class
+        
         <Priority>int</Priority>        [required] Lower values is happen first
         
         <researchDefs>                  [required] All the research listed must be complete for anything to happen
@@ -30,40 +34,9 @@
         <researchMods>                  [optional: null] Mod callback Actions, these will happen after everything else has been processed
             <li>Action</li>
         </researchMods>
-    -->
-
-    <AdvancedResearchDef>
-        
-        <defName>HideCryptoSleep</defName>
-        <Priority>0</Priority>
-        
-        <researchDefs>
-            <li>Cryptosleep</li>
-            <li>AncientTechnology</li>
-        </researchDefs>
-        
-        <HideDefs>true</HideDefs>
-        
-        <thingDefs>
-            <li>CryptosleepCasket</li>
-        </thingDefs>
         
     </AdvancedResearchDef>
 
-    <AdvancedResearchDef>
-        
-        <defName>BuildAncientCryptoSleep</defName>
-        <Priority>1</Priority>
-        
-        <researchDefs>
-            <li>Cryptosleep</li>
-            <li>AncientTechnology</li>
-        </researchDefs>
-        
-        <thingDefs>
-            <li>AncientCryptosleepCasket</li>
-        </thingDefs>
-        
-    </AdvancedResearchDef>
+    -->
 
 </Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Defs/HelpCategoryDefs/HelpCategoryDefs.xml b/_Mod/Modders Resource/Def Descriptions/HelpCategoryDefs/HelpCategoryDef.xml
similarity index 71%
rename from _Mod/User Release/Community Core Library/Defs/HelpCategoryDefs/HelpCategoryDefs.xml
rename to _Mod/Modders Resource/Def Descriptions/HelpCategoryDefs/HelpCategoryDef.xml
index a7b6559..39c6eed 100644
--- a/_Mod/User Release/Community Core Library/Defs/HelpCategoryDefs/HelpCategoryDefs.xml	
+++ b/_Mod/Modders Resource/Def Descriptions/HelpCategoryDefs/HelpCategoryDef.xml	
@@ -2,18 +2,17 @@
 <Defs>
 
     <!--
+
+    <HelpCategoryDef>
+
         <defName>string</defName>       [required] Some unique identifier in class
-        
+
         <ModName>string</ModName>       [required] Name of associated mod
-        
+
         <label>string</label>           [required] Title of help section within mod
-        
-    -->
 
-    <HelpCategoryDef>
-        <defName>CCLGizmoHelp</defName>
-        <ModName>Community Core Library</ModName>
-        <label>Gizmos</label>
     </HelpCategoryDef>
 
+    -->
+
 </Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/HelpDefs/HelpDef.xml b/_Mod/Modders Resource/Def Descriptions/HelpDefs/HelpDef.xml
new file mode 100644
index 0000000..792a60a
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/HelpDefs/HelpDef.xml	
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+
+    <HelpDef>
+
+        <defName>string</defName>       [required] Some unique identifier in class
+
+        <category>string</category>     [required] defName of category help topic
+
+        <label>string</label>           [required] Title of help topic
+
+        <description>string</description> [required] Information to tell the player
+
+    </HelpDef>
+
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/ModHelperDefs/ModHelperDef.xml b/_Mod/Modders Resource/Def Descriptions/ModHelperDefs/ModHelperDef.xml
new file mode 100644
index 0000000..31d69f8
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/ModHelperDefs/ModHelperDef.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+
+    <ModHelperDef>
+
+        <defName>string</defName>       [required] Some Unique Identifier In Class
+
+        <ModName>string</ModName>       [required] Name of your mod
+
+        <version>version</version>      [required] Minimum version of CCL required
+
+        <MapComponents>                 [optional] Class names of MapComponents to inject into save games
+            <li>MapComponent</li>
+        </MapComponents>
+
+        <Designators>                   [optional] List of Designators to inject Designation Categories
+            <li>
+                <designatorClass>Designator</designatorClass>
+                                        [required] Class name of Designator to inject
+
+                <designationCategoryDef>DesignationCategoryDef<designationCategoryDef>
+                                        [required] Designation Category to inject designator into
+            </li>
+        </Designators>
+
+    </ModHelperDef>
+
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_NotOnTerrain.xml b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_NotOnTerrain.xml
new file mode 100644
index 0000000..d6da6a0
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_NotOnTerrain.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    PlaceWorker:PlaceWorker_NotOnTerrain
+    
+    Requires:   RestrictedPlacement_Comp
+                ThingWithComps or TerrainWithComps
+    
+    This place worker restricts the building or terrain from being placed on any of the
+    filtered TerrainDefs.
+    
+    Comp Properties:
+    
+    type (default)  tag                 Details
+    
+    bool (false)    IncludeRoughStone   [optional] Auto-add all rough stone terrain defs to list
+    bool (false)    IncludeSmoothStone  [optional] Auto-add all smooth stone terrain defs to list
+    
+    TerrainDefs     terrainDefs         [required] List of terrain to do disallow placement on
+        (null)
+    
+    Usage:
+    
+    <Def>
+        ...
+        
+        <comps>
+            ...
+            
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                
+                <terrainDefs>
+                    <li>Soil</li>
+                    <li>SoilRich</li>
+                </terrainDefs>
+                
+            </li>
+            
+            ...
+        </comps>
+        
+        <placeWorkers>
+            ...
+            
+            <li>CommunityCoreLibrary.PlaceWorker_NotOnTerrain</li>
+            
+            ...
+        </placeWorkers>
+        
+        ...
+    </Def>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_NotOnThing.xml b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_NotOnThing.xml
new file mode 100644
index 0000000..7bc85c8
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_NotOnThing.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    PlaceWorker:PlaceWorker_NotOnThing
+    
+    Requires:   RestrictedPlacement_Comp
+                ThingWithComps
+    
+    This place worker restricts the building from being placed on any of the filtered ThingDefs.
+    
+    Comp Properties:
+    
+    type (default)  tag                 Details
+    
+    ThingDefs       thingDefs           [required] List of things to disallow placement on.
+        (null)
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <comps>
+            ...
+            
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                
+                <thingDefs>
+                    <li>ChunkGranite</li>
+                    <li>ChunkSandstone</li>
+                    <li>ChunkLimestone</li>
+                    <li>ChunkSlate</li>
+                    <li>ChunkMarble</li>
+                    <li>ChunkSlagSteel</li>
+                </thingDefs>
+                
+            </li>
+            
+            ...
+        </comps>
+        
+        <placeWorkers>
+            ...
+            
+            <li>CommunityCoreLibrary.PlaceWorker_NotOnThing</li>
+            
+            ...
+        </placeWorkers>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyOnSurface.xml b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyOnSurface.xml
new file mode 100644
index 0000000..42b25a8
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyOnSurface.xml	
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    PlaceWorker:PlaceWorker_OnlyOnSurface
+    
+    Requires:   RestrictedPlacement_Comp
+                ThingWithComps
+    
+    tickerType: Normal or Rare
+    
+    Only on surface (PlaceWorker_OnlyOnSurface) restricts placement of a new thing to cells where
+    there is an existing thing with a valid surfaceType (not None).
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <tickerType>Normal or Rare</tickerType>
+        
+        <comps>
+            ...
+            
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+            </li>
+            
+            ...
+        </comps>
+        
+        <placeWorkers>
+            ...
+            
+            <li>CommunityCoreLibrary.PlaceWorker_OnlyOnSurface</li>
+            
+            ...
+        </placeWorkers>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyOnTerrain.xml b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyOnTerrain.xml
new file mode 100644
index 0000000..fadf46a
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyOnTerrain.xml	
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    PlaceWorker:PlaceWorker_OnlyOnTerrain
+    
+    Requires:   RestrictedPlacement_Comp
+                ThingWithComps or TerrainWithComps
+    
+    This place worker restricts the building or terrain to being placed only on one of the
+    filtered TerrainDefs.
+    
+    Comp Properties:
+    
+    type (default)  tag                 Details
+    
+    bool (false)    IncludeRoughStone   [optional] Auto-add all rough stone terrain defs to list
+    bool (false)    IncludeSmoothStone  [optional] Auto-add all smooth stone terrain defs to list
+    
+    TerrainDefs     terrainDefs         [required] List of terrain to do allow placement on
+        (null)
+    
+    Usage:
+    
+    <Def>
+        ...
+        
+        <comps>
+            ...
+            
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                
+                <terrainDefs>
+                    <li>Soil</li>
+                    <li>SoilRich</li>
+                </terrainDefs>
+                
+            </li>
+            
+            ...
+        </comps>
+        
+        <placeWorkers>
+            ...
+            
+            <li>CommunityCoreLibrary.PlaceWorker_OnlyOnTerrain</li>
+            
+            ...
+        </placeWorkers>
+        
+        ...
+    </Def>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyOnThing.xml b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyOnThing.xml
new file mode 100644
index 0000000..b398850
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyOnThing.xml	
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    PlaceWorker:PlaceWorker_OnlyOnThing
+    
+    Requires:   RestrictedPlacement_Comp
+                ThingWithComps
+    
+    tickerType: Normal or Rare
+    
+    This place worker restricts the building to being placed only on one of the filtered ThingDefs.
+    
+    Comp Properties:
+    
+    type (default)  tag                 Details
+    
+    ThingDefs       thingDefs           [required] List of things to do allow placement on
+        (null)
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <tickerType>Normal or Rare</tickerType>
+        
+        <comps>
+            ...
+            
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                
+                <thingDefs>
+                    <li>ChunkGranite</li>
+                    <li>ChunkSandstone</li>
+                    <li>ChunkLimestone</li>
+                    <li>ChunkSlate</li>
+                    <li>ChunkMarble</li>
+                    <li>ChunkSlagSteel</li>
+                </thingDefs>
+                
+            </li>
+            
+            ...
+        </comps>
+        
+        <placeWorkers>
+            ...
+            
+            <li>CommunityCoreLibrary.PlaceWorker_OnlyOnThing</li>
+            
+            ...
+        </placeWorkers>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyUnderRoof.xml b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyUnderRoof.xml
new file mode 100644
index 0000000..cd2c14a
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_OnlyUnderRoof.xml	
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    PlaceWorker:PlaceWorker_OnlyUnderRoof
+    
+    Requires:   RestrictedPlacement_Comp
+                ThingWithComps or TerrainWithComps
+    
+    tickerType: Normal or Rare
+    
+    Only under roof (PlaceWorker_OnlyUnderRoof) restricts placement of a new thing to cells where
+    there is an existing roof.  Should the roof be removed for up to 250 normal ticks (one rare
+    tick), the thing will be destroyed and an alert will be raised for the player.
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <tickerType>Normal or Rare</tickerType>
+        
+        <comps>
+            ...
+            
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+            </li>
+            
+            ...
+        </comps>
+        
+        <placeWorkers>
+            ...
+            
+            <li>CommunityCoreLibrary.PlaceWorker_OnlyUnderRoof</li>
+            
+            ...
+        </placeWorkers>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_RestrictedCount.xml b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_RestrictedCount.xml
new file mode 100644
index 0000000..c32e821
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_RestrictedCount.xml	
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    PlaceWorker:PlaceWorker_RestrictedCount
+    
+    Requires:   RestrictedPlacement_Comp
+                ThingWithComps
+    
+    This place worker limits how many of this building can exist at any given time.
+    
+    Comp Properties:
+    
+    type (default)  tag                 Details
+    
+    int (-1)        MaxCount            [required] Maximum count of a building in the world
+    
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <comps>
+            ...
+            
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                
+                <MaxCount>2</MaxCount>
+                
+            </li>
+            
+            ...
+        </comps>
+        
+        <placeWorkers>
+            ...
+            
+            <li>CommunityCoreLibrary.PlaceWorker_OnlyOnThing</li>
+            
+            ...
+        </placeWorkers>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_WallAttachment.xml b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_WallAttachment.xml
new file mode 100644
index 0000000..8784a79
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/PlaceWorkers/PlaceWorker_WallAttachment.xml	
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    PlaceWorker:PlaceWorker_WallAttachment
+    
+    Requires:   RestrictedPlacement_Comp
+                ThingWithComps
+    
+    tickerType: Normal or Rare
+    
+    Wall attachment (PlaceWorker_WallAttachment) requires that the south* neighbouring cell has
+    an edifice with the "Rock" or "Wall" graphic linker flags.  Should the "wall" be removed for
+    up to 250 normal ticks (one rare tick), the thing will be destroyed and an alert will be raised
+    for the player.
+    
+    * Based on default rotation
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <tickerType>Normal or Rare</tickerType>
+        
+        <comps>
+            ...
+            
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+            </li>
+            
+            ...
+        </comps>
+        
+        <placeWorkers>
+            ...
+            
+            <li>CommunityCoreLibrary.PlaceWorker_WallAttachment</li>
+            
+            ...
+        </placeWorkers>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/Terrain/TerrainWithComps.xml b/_Mod/Modders Resource/Def Descriptions/Terrain/TerrainWithComps.xml
new file mode 100644
index 0000000..ed16fed
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/Terrain/TerrainWithComps.xml	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    Terrain:    TerrainWithComps
+    
+    tickerType: None
+    
+    Terrain with comps allows you to use the place workers which use RestrictedPlacement_Comp.
+    
+    Currently, the following place workers are supported:
+    
+        PlaceWorker_NotOnTerrain
+        PlaceWorker_OnlyOnTerrain
+        PlaceWorker_NotUnderRoof
+        PlaceWorker_OnlyUnderRoof
+    
+    Usage:
+    
+    <TerrainDef Class="CommunityCoreLibrary.TerrainWithComps">
+        ...
+        
+        <placeWorkers>
+            
+            ...
+            
+        </placeWorkers>
+        
+        <comps>
+            
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                ...
+            </li>
+            
+        </comps>
+        
+        ...
+    </TerrainDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/ThingClass/Building_Hydroponic.xml b/_Mod/Modders Resource/Def Descriptions/ThingClass/Building_Hydroponic.xml
new file mode 100644
index 0000000..131eced
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/ThingClass/Building_Hydroponic.xml	
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    ThingClass: Building_Hydroponic
+    
+    tickerType: Rare
+    
+    This is an clone of RimWorld.Building_PlantGrower changing the rare ticker to call. the
+    base class rare ticker, allowing comps to tick.  RimWorld.Building_PlantGrower does not
+    call base.TickRare(), this does.  This building is only really useful if you can comps
+    on a Building_PlantGrower which need rare ticking.  It is otherwise the same as the core
+    building.
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <thingClass>CommunityCoreLibrary.Building_Hydroponic</thingClass>
+        
+        <tickerType>Rare</tickerType>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/ThingClass/Building_SunLampHeatController.xml b/_Mod/Modders Resource/Def Descriptions/ThingClass/Building_SunLampHeatController.xml
new file mode 100644
index 0000000..2c6b712
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/ThingClass/Building_SunLampHeatController.xml	
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    ThingClass: Building_SunLampHeatController
+    
+    tickerType: Rare
+    
+    Building_SunLampHeatController (UV lamp), is a combination of two different buildings,
+    RimWorld.Building_SunLamp (sunlamp) and RimWorld.Building_Heater (heater).  Being both
+    a sunlamp and a heater, it offers both buildings controls and functionality into one
+    unit.
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <thingClass>CommunityCoreLibrary.Building_SunLampHeatController</thingClass>
+        
+        <tickerType>Rare</tickerType>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/ThingComps/CompColoredLight.xml b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompColoredLight.xml
new file mode 100644
index 0000000..2f53fa2
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompColoredLight.xml	
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    ThingComp:  CompColoredLight
+    
+    Requires:   CompProperties_ColoredLight
+                CompPowerTrader
+                CompGlower
+    
+    Using CompColoredLight allows you to reduce the amount of redundant build options available
+    to the user.  This comp allows a building to dynamically switch it's glower color through the
+    use of user-presented gizmo buttons on the building, saving time and tab clutter.  The comp
+    supports using the default list of light colors or defining unique colors specific to the
+    building.  The gizmos that share colors to other buildings with this comp use name matching
+    so two buildings can define the same named colour but with different colour values but will
+    be a match when the user uses the gizmos.  eg, "red" (192,0,0,0) and "red" (227,15,15,0)
+    will be accepted as the same color based on the name "red."  When using this comp on
+    different buildings with different research requirements to change color, the requirement
+    of each building is respected so that lights won't change on buildings which don't have the
+    prerequisite tech researched.
+    
+    XML Data:
+    
+    type (default)  tag                 Details
+    
+    string          requiredResearch    [optional] Research required to change light color
+       (ColoredLights)
+    int (0)         Default             [optional] Default initial color index
+    ColorName (*)   color               [optional] List of color names and values
+    
+    * This is a list of names and colors, the default internal list is as follows:
+        
+        name        value
+        white       (217,217,217,0)
+        red         (217,0,0,0)
+        green       (0,217,0,0)
+        blue        (0,0,217,0)
+        yellow      (217,217,43,0)
+        orange      (255,132,0,0)
+        purple      (185,61,205,0)
+        
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <comps>
+            ...
+            
+            <li>
+                <compClass>CompPowerTrader</compClass>
+                ...
+            </li>
+            
+            <li>
+                <compClass>CompGlower</compClass>
+                ...
+            </li>
+            
+            <li Class="CommunityCoreLibrary.CompProperties_ColoredLight">
+                <compClass>CommunityCoreLibrary.CompColoredLight</compClass>
+                
+                <requiredResearch>ColoredLights</requiredResearch>
+                
+                <Default>0</Default>
+                
+                <color>
+                    <li>
+                        <name>white</name>
+                        <value>(217,217,217,0)</value>
+                    </li>
+                    <li>
+                        <name>red</name>
+                        <value>(217,0,0,0)</value>
+                    </li>
+                    <li>
+                        <name>green</name>
+                        <valud>(0,217,0,0)</value>
+                    </li>
+                    <li>
+                        <name>blue</name>
+                        <value>(0,0,217,0)</value>
+                    </li>
+                    <li>
+                        <name>yellow</name>
+                        <value>(217,217,43,0)</value>
+                    </li>
+                    <li>
+                        <name>orange</name>
+                        <value>(255,132,0,0)</value>
+                    </li>
+                    <li>
+                        <name>purple</name>
+                        <value>(185,61,205,0)</value>
+                    </li>
+                </color>
+                
+            </li>
+            
+            ...
+        </comps>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/ThingComps/CompHeatPusherPowered.xml b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompHeatPusherPowered.xml
new file mode 100644
index 0000000..7fa50b2
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompHeatPusherPowered.xml	
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    ThingComp:  CompHeatPusherPowered
+    
+    Requires:   CompPowerTrader
+                CompPowerLowIdleDraw
+    
+    tickerType: Normal
+    
+    This is an clone of Verse.CompHeatPusherPowered adding idle power awareness but is
+    otherwise the same.
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <tickerType>Normal</tickerType>
+        
+        <comps>
+            ...
+            
+            <li>
+                <compClass>CompPowerTrader</compClass>
+                ...
+            </li>
+            
+            <li Class="CommunityCoreLibrary.CompProperties_LowIdleDraw">
+                <compClass>CommunityCoreLibrary.CompPowerLowIdleDraw</compClass>
+                ...
+            </li>
+            
+            <li>
+                <compClass>CommunityCoreLibrary.CompHeatPusherPowered</compClass>
+                ...
+            </li>
+            
+            ...
+        </comps>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/ThingComps/CompLifespanPowered.xml b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompLifespanPowered.xml
new file mode 100644
index 0000000..73ddf24
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompLifespanPowered.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    ThingComp:  CompLifespanPowered
+    
+    Requires:   CompPowerTrader
+    
+    tickerType: Normal or Rare
+    
+    This is an clone of RimWorld.CompLifespan adding a power requirment.  This comp will only
+    tick down the age when the building is powered.
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <tickerType>Normal or Rare</tickerType>
+        
+        <comps>
+            ...
+            
+            <li>
+                <compClass>CompPowerTrader</compClass>
+                ...
+            </li>
+            
+            <li>
+                <compClass>CommunityCoreLibrary.CompLifespanPowered</compClass>
+                ...
+            </li>
+            
+            ...
+        </comps>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/ThingComps/CompNeighbourlyGrower.xml b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompNeighbourlyGrower.xml
new file mode 100644
index 0000000..338b115
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompNeighbourlyGrower.xml	
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    ThingComp:  CompNeighbourlyGrower
+    
+    Requires:   Building_PlantGrower
+    
+    This comp provides the user with gizmos to share growing information with other
+    Building_PlantGrowers (or child classes) using the comp.
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <comps>
+            ...
+            
+            <li>
+                <compClass>CommunityCoreLibrary.CompNeighbourlyGrower</compClass>
+            </li>
+            
+            ...
+        </comps>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/ThingComps/CompPowerLowIdleDraw.xml b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompPowerLowIdleDraw.xml
new file mode 100644
index 0000000..00f13be
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompPowerLowIdleDraw.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    ThingComp:  CompPowerLowIdleDraw
+    
+    Requires:   CompProperties_LowIdleDraw
+                CompPowerTrader
+    
+    tickerType: Normal or Rare
+    
+    Optional:   CompGlower
+    
+    CompPowerLowIdleDraw (comp idle power), will modify the power usage of a building based on
+    it's operational mode.  Modes curently include "InUse" (work tables), "WhenNear" (pawn is in
+    any cell the building uses or in any adjacent cell to the building) and "Cycle" (operates in
+    "full power" mode for a specified number of ticks then in "low power" mode for a specified
+    number of ticks, cycling between modes).
+    
+    Comp Properties:
+    
+    type (default)  tag                 Details
+    
+    float (0)       idlePowerFactor     [optional] Idle-power basePowerConsumption multiplier
+    enum (InUse)    operationalMode     [optional] Power switching mode
+    int (*)         cycleLowTicks       [optional] Number of normal ticks to operate in low-power mode
+    int (*)         cycleHighTicks      [optional] Number of normal ticks to operate in high-power mode
+    
+    * These values are variable depending on the operationalMode.  Note that at the end of
+    a cycle power may not be switched if the conditions would allow it to stay in that mode.
+    The default values are as follows:
+        
+        mode        low         high
+        InUse       30          500
+        WhenNear    30          500
+        Cycle       1000        500
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <tickerType>Normal or Rare</tickerType>
+        
+        <comps>
+            ...
+            
+            <li>
+                <compClass>CompPowerTrader</compClass>
+                ...
+            </li>
+            
+            <li Class="CommunityCoreLibrary.CompProperties_LowIdleDraw">
+                <compClass>CommunityCoreLibrary.CompPowerLowIdleDraw</compClass>
+                
+                <idlePowerFactor>0</idlePowerFactor>
+                
+                <operationalMode>InUse</operationalMode>
+                
+                <cycleLowTicks>-1</cycleLowTicks>
+                <cycleHighTicks>-1</cycleHighTicks>
+                
+            </li>
+            
+            ...
+        </comps>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/ThingComps/CompRefrigerated.xml b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompRefrigerated.xml
new file mode 100644
index 0000000..bc0e886
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/ThingComps/CompRefrigerated.xml	
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    ThingComp:  CompRefrigerated
+    
+    Requires:   CompPowerTrader
+    
+    tickerType: Normal
+    
+    This comp will maintain the health and rotProgress of all items in the storage building
+    which are ThingWithComps and have CompRottable, while powered.
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <tickerType>Normal</tickerType>
+        
+        <comps>
+            ...
+            
+            <li>
+                <compClass>CompPowerTrader</compClass>
+                ...
+            </li>
+            
+            <li>
+                <compClass>CommunityCoreLibrary.CompRefrigerated</compClass>
+                ...
+            </li>
+            
+            ...
+        </comps>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Def Descriptions/ThingComps/RestrictedPlacement_Comp.xml b/_Mod/Modders Resource/Def Descriptions/ThingComps/RestrictedPlacement_Comp.xml
new file mode 100644
index 0000000..7e74149
--- /dev/null
+++ b/_Mod/Modders Resource/Def Descriptions/ThingComps/RestrictedPlacement_Comp.xml	
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--
+    
+    Namespace:  CommunityCoreLibrary
+    
+    ThingComp:  RestrictedPlacement_Comp
+    
+    Requires:   RestrictedPlacement_Properties
+    
+    tickerType: Depends on PlaceWorker
+    
+    If using certain PlaceWorkers, this comp is required to store additional information
+    to use the PlaceWorker.  Depending on which PlaceWorker is used, this comp may need
+    ticking.  See the individual PlaceWorkers for additional details.
+    
+    Comp Properties:
+    
+    type (default)  tag                 Details
+    
+    int (-1)        MaxCount            [optional] Maximum count of a building in the world
+    
+    bool (false)    IncludeRoughStone   [optional] Auto-add all rough stone terrain defs to list
+    bool (false)    IncludeSmoothStone  [optional] Auto-add all smooth stone terrain defs to list
+    
+    TerrainDefs     terrainDefs         [optional] List of terrain to use when filtering
+        (null)                          cells to [dis]allow placement on
+    
+    ThingDefs       thingDefs           [optional] List of things to use when filtering
+        (null)                          cells to [dis]allow placement on
+    
+    Usage:
+    
+    <ThingDef>
+        ...
+        
+        <tickerType>Depends on PlaceWorker</tickerType>
+        
+        <comps>
+            ...
+            
+            <li>
+                <compClass>CompPowerTrader</compClass>
+                ...
+            </li>
+            
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                ...
+            </li>
+            
+            ...
+        </comps>
+        
+        ...
+    </ThingDef>
+    
+    -->
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/AdvancedResearchDefs/Advanced_Exclusive_Tech.xml b/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/AdvancedResearchDefs/Advanced_Exclusive_Tech.xml
deleted file mode 100644
index 062c635..0000000
--- a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/AdvancedResearchDefs/Advanced_Exclusive_Tech.xml	
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] Some unique identifier in class
-        <Priority>int</Priority>        [required] Lower values is happen first
-        
-        <researchDefs>                  [required] All the research listed must be complete for anything to happen
-            <li>ResearchProjectDef</li>
-        </researchDefs>
-        
-        <HideDefs>bool</HideDefs>       [optional: false] Set to true to disable (hide) or false to enable
-        
-        <recipeDefs>                    [optional: null] Recipes to toggle on buildings, requires <thingDefs>
-            <li>RecipeDef</li>          with <thingClass> implementing "IBillGiver"
-        </recipeDef>
-        
-        <sowTags>                       [optional: null] Plant sowTags to toggle, requires <thingDefs> with
-            <li>string</li>             <thingClass> "Plant"
-        </sowTags>
-        
-        <thingsDefs>                    [optional: null] The things to effect depending on other tags,
-            <li>ThingDef</li>           If no other dependant tags exist, toggles buildings in the architect tabs
-        </thingDefs>                    with a valid <designationCategory> (must not be null or "None")
-        
-        <effectedResearchDefs>          [optional: null] Research projects to unlock or lock, can be used to
-            <li>ResearchProjectDef</li> create exclusive branches of research
-        </effectedResearchDefs>
-        
-        <researchMods>                  [optional: null] Mod callback Actions, these will happen after everything else has been processed
-            <li>Action</li>
-        </researchMods>
-    -->
-
-    <AdvancedResearchDef>
-        <!--
-            This def will hide the other exclusive tree
-        -->
-        
-        <defName>ExclusiveTreeOne</defName>
-        <Priority>0</Priority>
-        
-        <HideDefs>true</HideDefs>
-        
-        <researchDefs>
-            <li>ExclusiveTechOne</li>
-        </researchDefs>
-        
-        <effectedResearchDefs>
-            <li>ExclusiveTechTwo</li>
-        </effectedResearchDefs>
-        
-    </AdvancedResearchDef>
-
-    <AdvancedResearchDef>
-        <!--
-            This def will hide the other exclusive tree
-        -->
-        
-        <defName>ExclusiveTreeTwo</defName>
-        <Priority>0</Priority>
-        
-        <HideDefs>true</HideDefs>
-        
-        <researchDefs>
-            <li>ExclusiveTechTwo</li>
-        </researchDefs>
-        
-        <effectedResearchDefs>
-            <li>ExclusiveTechOne</li>
-        </effectedResearchDefs>
-        
-    </AdvancedResearchDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/AdvancedResearchDefs/Advanced_Inclusive_Tech.xml b/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/AdvancedResearchDefs/Advanced_Inclusive_Tech.xml
deleted file mode 100644
index b427f84..0000000
--- a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/AdvancedResearchDefs/Advanced_Inclusive_Tech.xml	
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] Some unique identifier in class
-        <Priority>int</Priority>        [required] Lower values is happen first
-        
-        <researchDefs>                  [required] All the research listed must be complete for anything to happen
-            <li>ResearchProjectDef</li>
-        </researchDefs>
-        
-        <HideDefs>bool</HideDefs>       [optional: false] Set to true to disable (hide) or false to enable
-        
-        <recipeDefs>                    [optional: null] Recipes to toggle on buildings, requires <thingDefs>
-            <li>RecipeDef</li>          with <thingClass> implementing "IBillGiver"
-        </recipeDef>
-        
-        <sowTags>                       [optional: null] Plant sowTags to toggle, requires <thingDefs> with
-            <li>string</li>             <thingClass> "Plant"
-        </sowTags>
-        
-        <thingsDefs>                    [optional: null] The things to effect depending on other tags,
-            <li>ThingDef</li>           If no other dependant tags exist, toggles buildings in the architect tabs
-        </thingDefs>                    with a valid <designationCategory> (must not be null or "None")
-        
-        <effectedResearchDefs>          [optional: null] Research projects to unlock or lock, can be used to
-            <li>ResearchProjectDef</li> create exclusive branches of research
-        </effectedResearchDefs>
-        
-        <researchMods>                  [optional: null] Mod callback Actions, these will happen after everything else has been processed
-            <li>Action</li>
-        </researchMods>
-    -->
-
-    <AdvancedResearchDef>
-        <!--
-            This def will enable the other inclusive tree
-        -->
-        
-        <defName>InclusiveTreeOne</defName>
-        <Priority>0</Priority>
-        
-        <researchDefs>
-            <li>ExclusiveTechOneTwo</li>
-        </researchDefs>
-        
-        <effectedResearchDefs>
-            <li>InclusiveTech</li>
-        </effectedResearchDefs>
-        
-    </AdvancedResearchDef>
-
-    <AdvancedResearchDef>
-        <!--
-            This def will enable the other inclusive tree
-        -->
-        
-        <defName>InclusiveTreeTwo</defName>
-        <Priority>0</Priority>
-        
-        <researchDefs>
-            <li>ExclusiveTechTwoTwo</li>
-        </researchDefs>
-        
-        <effectedResearchDefs>
-            <li>InclusiveTech</li>
-        </effectedResearchDefs>
-        
-    </AdvancedResearchDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/CCLVersionDefs/CCLVersion.xml b/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/CCLVersionDefs/CCLVersion.xml
deleted file mode 100644
index f776005..0000000
--- a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/CCLVersionDefs/CCLVersion.xml	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] SomeUniqueIdentifierInClass
-        
-        <ModName>string</ModName>       [required] Name of your mod
-        
-        <version>version</version>      [required] Minimum version of CCL required
-    -->
-
-    <CCLVersionDef>
-        <defName>ReplacingTechVersion</defName>
-        <ModName>Modders Resource: Exclusive Tech</ModName>
-        <version>0.11.5</version>
-    </CCLVersionDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/Defs/CCLVersionDefs/CCLVersion.xml b/_Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/Defs/CCLVersionDefs/CCLVersion.xml
deleted file mode 100644
index 2f7cb20..0000000
--- a/_Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/Defs/CCLVersionDefs/CCLVersion.xml	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] SomeUniqueIdentifierInClass
-        
-        <ModName>string</ModName>       [required] Name of your mod
-        
-        <version>version</version>      [required] Minimum version of CCL required
-    -->
-
-    <CCLVersionDef>
-        <defName>AncientTechVersion</defName>
-        <ModName>Modders Resource: Ancient Tech</ModName>
-        <version>0.11.5</version>
-    </CCLVersionDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/About/About.xml b/_Mod/Modders Resource/Examples/Advanced Research/Building Example/About/About.xml
similarity index 76%
rename from _Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/About/About.xml
rename to _Mod/Modders Resource/Examples/Advanced Research/Building Example/About/About.xml
index f3a6456..1dbee30 100644
--- a/_Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/About/About.xml	
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Building Example/About/About.xml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
-    <name>Ancient Tech</name>
+    <name>Building Example</name>
     <author>RimWorld CCL Team</author>
     <url>n/a</url>
-    <targetVersion>Community Core Library v0.11.5</targetVersion>
+    <targetVersion>Community Core Library v0.12.0</targetVersion>
     <description>
 	This is an example of how to lock and unlock buildings as new research is complete.
     
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Building Example/Defs/AdvancedResearchDefs/Building_Example.xml b/_Mod/Modders Resource/Examples/Advanced Research/Building Example/Defs/AdvancedResearchDefs/Building_Example.xml
new file mode 100644
index 0000000..8e084ee
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Building Example/Defs/AdvancedResearchDefs/Building_Example.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <AdvancedResearchDef>
+        <!--
+            This def disables the normal crypto sleep
+        -->
+
+        <defName>HideCryptoSleep</defName>
+        <Priority>0</Priority>
+
+        <researchDefs>
+            <li>Cryptosleep</li>
+            <li>AncientTechnology</li>
+        </researchDefs>
+
+        <HideDefs>true</HideDefs>
+
+        <thingDefs>
+            <li>CryptosleepCasket</li>
+        </thingDefs>
+
+    </AdvancedResearchDef>
+
+    <AdvancedResearchDef>
+        <!--
+            This def enables the ancient crypto sleep
+        -->
+
+        <defName>BuildAncientCryptoSleep</defName>
+        <Priority>1</Priority>
+
+        <researchDefs>
+            <li>Cryptosleep</li>
+            <li>AncientTechnology</li>
+        </researchDefs>
+
+        <thingDefs>
+            <li>AncientCryptosleepCasket</li>
+        </thingDefs>
+
+    </AdvancedResearchDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Building Example/Defs/ModHelperDefs/Building_Example.xml b/_Mod/Modders Resource/Examples/Advanced Research/Building Example/Defs/ModHelperDefs/Building_Example.xml
new file mode 100644
index 0000000..0b73da2
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Building Example/Defs/ModHelperDefs/Building_Example.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <ModHelperDef>
+        <defName>BuildingExample</defName>
+        
+        <ModName>Building Example</ModName>
+        
+        <version>0.12.0</version>
+        
+    </ModHelperDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/Defs/ResearchProjectDefs/Research_Ancient_Tech.xml b/_Mod/Modders Resource/Examples/Advanced Research/Building Example/Defs/ResearchProjectDefs/Building_Example.xml
similarity index 93%
rename from _Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/Defs/ResearchProjectDefs/Research_Ancient_Tech.xml
rename to _Mod/Modders Resource/Examples/Advanced Research/Building Example/Defs/ResearchProjectDefs/Building_Example.xml
index 8ffcbda..9309b94 100644
--- a/_Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/Defs/ResearchProjectDefs/Research_Ancient_Tech.xml	
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Building Example/Defs/ResearchProjectDefs/Building_Example.xml	
@@ -6,7 +6,7 @@
         <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>
-        <totalCost>1500</totalCost>
+        <totalCost>1</totalCost>
         <prerequisites/>
     </ResearchProjectDef>
 
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/Defs/ThingDefs/Buildings_Ancient.xml b/_Mod/Modders Resource/Examples/Advanced Research/Building Example/Defs/ThingDefs/Building_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Ancient Tech/Defs/ThingDefs/Buildings_Ancient.xml
rename to _Mod/Modders Resource/Examples/Advanced Research/Building Example/Defs/ThingDefs/Building_Example.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/About/About.xml b/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/About/About.xml
similarity index 76%
rename from _Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/About/About.xml
rename to _Mod/Modders Resource/Examples/Advanced Research/Recipe Example/About/About.xml
index 1029081..f4e1490 100644
--- a/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/About/About.xml	
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/About/About.xml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
-    <name>Replacing Tech</name>
+    <name>Recipe Example</name>
     <author>RimWorld CCL Team</author>
     <url>n/a</url>
-    <targetVersion>Community Core Library v0.11.5</targetVersion>
+    <targetVersion>Community Core Library v0.12.0</targetVersion>
     <description>
 	This is an example of how to lock and unlock recipes as new research is complete.
 
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/AdvancedResearchDefs/Recipe_Example.xml b/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/AdvancedResearchDefs/Recipe_Example.xml
new file mode 100644
index 0000000..5f6c5b2
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/AdvancedResearchDefs/Recipe_Example.xml	
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <AdvancedResearchDef>
+        <!--
+            This def will add the level 1 recipe to the bulb
+        -->
+        
+        <defName>AdvancedTechLevelOneAdd</defName>
+        <Priority>0</Priority>
+        
+        <researchDefs>
+            <li>TechLevelOne</li>
+        </researchDefs>
+        
+        <recipeDefs>
+            <li>TechRecipeOne</li>
+        </recipeDefs>
+        
+        <thingDefs>
+            <li>ReplaceRecipeTest</li>
+        </thingDefs>
+        
+    </AdvancedResearchDef>
+
+    <AdvancedResearchDef>
+        <!--
+            This def will remove the level 1 recipe to the bulb after level 2 is researched
+        -->
+        
+        <defName>AdvancedTechLevelOneRemove</defName>
+        <Priority>1</Priority>
+        
+        <researchDefs>
+            <li>TechLevelTwo</li>
+        </researchDefs>
+        
+        <HideDefs>true</HideDefs>
+        
+        <recipeDefs>
+            <li>TechRecipeOne</li>
+        </recipeDefs>
+        
+        <thingDefs>
+            <li>ReplaceRecipeTest</li>
+        </thingDefs>
+        
+    </AdvancedResearchDef>
+
+    <AdvancedResearchDef>
+        <!--
+            And now, add the level 2 recipe to the table
+        -->
+        
+        <defName>AdvancedTechLevelTwoAdd</defName>
+        <Priority>2</Priority>
+        
+        <researchDefs>
+            <li>TechLevelTwo</li>
+        </researchDefs>
+        
+        <recipeDefs>
+            <li>TechRecipeTwo</li>
+        </recipeDefs>
+        
+        <thingDefs>
+            <li>ReplaceRecipeTest</li>
+        </thingDefs>
+        
+    </AdvancedResearchDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ModHelperDefs/Recipe_Example.xml b/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ModHelperDefs/Recipe_Example.xml
new file mode 100644
index 0000000..f52e789
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ModHelperDefs/Recipe_Example.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <ModHelperDef>
+        <defName>RecipeExample</defName>
+
+        <ModName>Recipe Example</ModName>
+
+        <version>0.12.0</version>
+
+    </ModHelperDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/RecipeDefs/Recipes_Replacing_Tech.xml b/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/RecipeDefs/Recipe_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/RecipeDefs/Recipes_Replacing_Tech.xml
rename to _Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/RecipeDefs/Recipe_Example.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/ResearchProjectDefs/Research_Replacing_Tech.xml b/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ResearchProjectDefs/Recipe_Example.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/ResearchProjectDefs/Research_Replacing_Tech.xml
rename to _Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ResearchProjectDefs/Recipe_Example.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/ThingDefs/Buildings_Replacing_Tech.xml b/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ThingDefs/Recipe_Example.xml
similarity index 91%
rename from _Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/ThingDefs/Buildings_Replacing_Tech.xml
rename to _Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ThingDefs/Recipe_Example.xml
index a2ee2da..9277f7f 100644
--- a/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/ThingDefs/Buildings_Replacing_Tech.xml	
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Recipe Example/Defs/ThingDefs/Recipe_Example.xml	
@@ -20,12 +20,10 @@
         <graphicData>
             <texPath>Things/Building/Furniture/LampStanding</texPath>
             <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
+            <shadowData>
+                <volume>(0.3, 0.6, 0.3)</volume>
                 <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
+            </shadowData>
         </graphicData>
         <altitudeLayer>Waist</altitudeLayer>
         <passability>PassThroughOnly</passability>
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/AdvancedResearchDefs/Advanced_Replacing_Tech.xml b/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/AdvancedResearchDefs/Advanced_Replacing_Tech.xml
deleted file mode 100644
index 2bded8c..0000000
--- a/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/AdvancedResearchDefs/Advanced_Replacing_Tech.xml	
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] Some unique identifier in class
-        <Priority>int</Priority>        [required] Lower values is happen first
-        
-        <researchDefs>                  [required] All the research listed must be complete for anything to happen
-            <li>ResearchProjectDef</li>
-        </researchDefs>
-        
-        <HideDefs>bool</HideDefs>       [optional: false] Set to true to disable (hide) or false to enable
-        
-        <recipeDefs>                    [optional: null] Recipes to toggle on buildings, requires <thingDefs>
-            <li>RecipeDef</li>          with <thingClass> implementing "IBillGiver"
-        </recipeDef>
-        
-        <sowTags>                       [optional: null] Plant sowTags to toggle, requires <thingDefs> with
-            <li>string</li>             <thingClass> "Plant"
-        </sowTags>
-        
-        <thingsDefs>                    [optional: null] The things to effect depending on other tags,
-            <li>ThingDef</li>           If no other dependant tags exist, toggles buildings in the architect tabs
-        </thingDefs>                    with a valid <designationCategory> (must not be null or "None")
-        
-        <effectedResearchDefs>          [optional: null] Research projects to unlock or lock, can be used to
-            <li>ResearchProjectDef</li> create exclusive branches of research
-        </effectedResearchDefs>
-        
-        <researchMods>                  [optional: null] Mod callback Actions, these will happen after everything else has been processed
-            <li>Action</li>
-        </researchMods>
-    -->
-
-    <AdvancedResearchDef>
-        <!--
-            This def will add the level 1 recipe to the bulb
-        -->
-        
-        <defName>AdvancedTechLevelOneAdd</defName>
-        <Priority>0</Priority>
-        
-        <researchDefs>
-            <li>TechLevelOne</li>
-        </researchDefs>
-        
-        <recipeDefs>
-            <li>TechRecipeOne</li>
-        </recipeDefs>
-        
-        <thingDefs>
-            <li>ReplaceRecipeTest</li>
-        </thingDefs>
-        
-    </AdvancedResearchDef>
-
-    <AdvancedResearchDef>
-        <!--
-            This def will remove the level 1 recipe to the bulb after level 2 is researched
-        -->
-        
-        <defName>AdvancedTechLevelOneRemove</defName>
-        <Priority>1</Priority>
-        
-        <researchDefs>
-            <li>TechLevelTwo</li>
-        </researchDefs>
-        
-        <HideDefs>true</HideDefs>
-        
-        <recipeDefs>
-            <li>TechRecipeOne</li>
-        </recipeDefs>
-        
-        <thingDefs>
-            <li>ReplaceRecipeTest</li>
-        </thingDefs>
-        
-    </AdvancedResearchDef>
-
-    <AdvancedResearchDef>
-        <!--
-            And now, add the level 2 recipe to the table
-        -->
-        
-        <defName>AdvancedTechLevelTwoAdd</defName>
-        <Priority>2</Priority>
-        
-        <researchDefs>
-            <li>TechLevelTwo</li>
-        </researchDefs>
-        
-        <recipeDefs>
-            <li>TechRecipeTwo</li>
-        </recipeDefs>
-        
-        <thingDefs>
-            <li>ReplaceRecipeTest</li>
-        </thingDefs>
-        
-    </AdvancedResearchDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/CCLVersionDefs/CCLVersion.xml b/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/CCLVersionDefs/CCLVersion.xml
deleted file mode 100644
index f984a8a..0000000
--- a/_Mod/Modders Resource/Examples/Advanced Research/Replacing Tech/Defs/CCLVersionDefs/CCLVersion.xml	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] SomeUniqueIdentifierInClass
-        
-        <ModName>string</ModName>       [required] Name of your mod
-        
-        <version>version</version>      [required] Minimum version of CCL required
-    -->
-
-    <CCLVersionDef>
-        <defName>ReplacingTechVersion</defName>
-        <ModName>Modders Resource: Replacing Tech</ModName>
-        <version>0.11.5</version>
-    </CCLVersionDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/About/About.xml b/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/About/About.xml
similarity index 57%
rename from _Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/About/About.xml
rename to _Mod/Modders Resource/Examples/Advanced Research/Research Project Example/About/About.xml
index e511f28..951175a 100644
--- a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/About/About.xml	
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/About/About.xml	
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
-    <name>Advanced Tech</name>
+    <name>Research Project Example</name>
     <author>RimWorld CCL Team</author>
     <url>n/a</url>
-    <targetVersion>Community Core Library v0.11.5</targetVersion>
+    <targetVersion>Community Core Library v0.12.0</targetVersion>
     <description>
 	This is an example of how to lock and unlock research projects as new research is complete.
 
 	Demonstrates:
-	AdvancedResearchDef to allow mutual inclusion and exclusion of research projects
+	AdvancedResearchDef to allow mutual exclusion and alternate path inclusion of research projects
     </description>
 </ModMetaData>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Exclusive.xml b/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Exclusive.xml
new file mode 100644
index 0000000..24b4bf6
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Exclusive.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <AdvancedResearchDef>
+        <!--
+            This def will hide the other exclusive tree
+        -->
+
+        <defName>ExclusiveTreeOne</defName>
+        <Priority>0</Priority>
+
+        <HideDefs>true</HideDefs>
+
+        <researchDefs>
+            <li>ExclusiveTechOne</li>
+        </researchDefs>
+
+        <effectedResearchDefs>
+            <li>ExclusiveTechTwo</li>
+        </effectedResearchDefs>
+
+    </AdvancedResearchDef>
+
+    <AdvancedResearchDef>
+        <!--
+            This def will hide the other exclusive tree
+        -->
+
+        <defName>ExclusiveTreeTwo</defName>
+        <Priority>0</Priority>
+
+        <HideDefs>true</HideDefs>
+
+        <researchDefs>
+            <li>ExclusiveTechTwo</li>
+        </researchDefs>
+
+        <effectedResearchDefs>
+            <li>ExclusiveTechOne</li>
+        </effectedResearchDefs>
+
+    </AdvancedResearchDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Inclusive.xml b/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Inclusive.xml
new file mode 100644
index 0000000..fad0096
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/AdvancedResearchDefs/AdvancedResearch_Inclusive.xml	
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <AdvancedResearchDef>
+        <!--
+            This def will enable the other inclusive tree
+        -->
+
+        <defName>InclusiveTreeOne</defName>
+        <Priority>0</Priority>
+
+        <researchDefs>
+            <li>ExclusiveTechOneTwo</li>
+        </researchDefs>
+
+        <effectedResearchDefs>
+            <li>InclusiveTech</li>
+        </effectedResearchDefs>
+
+    </AdvancedResearchDef>
+
+    <AdvancedResearchDef>
+        <!--
+            This def will enable the other inclusive tree
+        -->
+
+        <defName>InclusiveTreeTwo</defName>
+        <Priority>0</Priority>
+
+        <researchDefs>
+            <li>ExclusiveTechTwoTwo</li>
+        </researchDefs>
+
+        <effectedResearchDefs>
+            <li>InclusiveTech</li>
+        </effectedResearchDefs>
+
+    </AdvancedResearchDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ModHelperDefs/Research_Project_Example.xml b/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ModHelperDefs/Research_Project_Example.xml
new file mode 100644
index 0000000..bd4f590
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ModHelperDefs/Research_Project_Example.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <ModHelperDef>
+        <defName>ResearchProjectExample</defName>
+
+        <ModName>Research Project Example</ModName>
+
+        <version>0.12.0</version>
+
+    </ModHelperDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/ResearchProjectDefs/Research_Exclusive_Tech.xml b/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Exclusive.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/ResearchProjectDefs/Research_Exclusive_Tech.xml
rename to _Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Exclusive.xml
diff --git a/_Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/ResearchProjectDefs/Research_Inclusive_Tech.xml b/_Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Inclusive.xml
similarity index 100%
rename from _Mod/Modders Resource/Examples/Advanced Research/Advanced Tech/Defs/ResearchProjectDefs/Research_Inclusive_Tech.xml
rename to _Mod/Modders Resource/Examples/Advanced Research/Research Project Example/Defs/ResearchProjectDefs/ResearchProjects_Inclusive.xml
diff --git a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/About/About.xml b/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/About/About.xml
index fe8b7b9..019be69 100644
--- a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/About/About.xml	
+++ b/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/About/About.xml	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
-    <name>PlaceWorker_Restrictions</name>
+    <name>PlaceWorker Restrictions</name>
     <author>RimWorld CCL Team</author>
     <url>n/a</url>
-    <targetVersion>Community Core Library v0.11.2</targetVersion>
+    <targetVersion>Community Core Library v0.12.0</targetVersion>
     <description>
 	This is an example of how to use certain PlaceWorkers.
 
@@ -15,5 +15,6 @@
 	PlaceWorker_OnlyOnThing
 	RestrictedPlacement_Comp
 	RestrictedPlacement_Properties
+    TerrainWithComps
     </description>
 </ModMetaData>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/CCLVersionDefs/CCLVersion.xml b/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/CCLVersionDefs/CCLVersion.xml
deleted file mode 100644
index 76cd638..0000000
--- a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/CCLVersionDefs/CCLVersion.xml	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] SomeUniqueIdentifierInClass
-        
-        <ModName>string</ModName>       [required] Name of your mod
-        
-        <version>version</version>      [required] Minimum version of CCL required
-    -->
-
-    <CCLVersionDef>
-        <defName>PlaceWorkerRestrictionsVersion</defName>
-        <ModName>Modders Resource: Place Worker Restrictions</ModName>
-        <version>0.11.2</version>
-    </CCLVersionDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ModHelperDefs/PlaceWorker_Restrictions_Example.xml b/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ModHelperDefs/PlaceWorker_Restrictions_Example.xml
new file mode 100644
index 0000000..f4fc6e0
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ModHelperDefs/PlaceWorker_Restrictions_Example.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <ModHelperDef>
+        <defName>PlaceWorkerRestrictionsVersion</defName>
+
+        <ModName>Place Worker Restrictions</ModName>
+
+        <version>0.12.0</version>
+
+    </ModHelperDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/TerrainDefs/PlaceWorker_Restrictions_Example.xml b/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/TerrainDefs/PlaceWorker_Restrictions_Example.xml
new file mode 100644
index 0000000..e8639f1
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/TerrainDefs/PlaceWorker_Restrictions_Example.xml	
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <TerrainDef Name="FloorBase" Abstract="True" >
+        <layerable>true</layerable>
+        <affordances>
+            <li>Light</li>
+            <li>Heavy</li>
+            <li>SmoothHard</li>
+        </affordances>
+        <statBases>
+            <WorkToMake>10</WorkToMake>
+        </statBases>
+        <designationCategory>Floors</designationCategory>
+        <Fertility>0</Fertility>
+        <constructEffect>ConstructDirt</constructEffect>
+        <AcceptTerrainSourceFilth>True</AcceptTerrainSourceFilth>
+        <terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
+    </TerrainDef>
+
+
+    <!-- ================= NotOnTerrain ================= -->
+
+    <TerrainDef ParentName="FloorBase" Class="CommunityCoreLibrary.TerrainWithComps">
+        <DefName>TerrainNotOnTerrain</DefName>
+        <label>terrain not on terrain test</label>
+        <RenderPrecedence>200</RenderPrecedence>
+        <Description>Can't place this on most terrain.</Description>
+        <texturePath>Terrain/Surfaces/GenericFloorTile</texturePath>
+        <color>(0.45, 0.45, 0.45)</color>
+        <CostList>
+            <Steel>1</Steel>
+        </CostList>
+        <constructEffect>ConstructMetal</constructEffect>
+        <placeWorkers>
+            <li>CommunityCoreLibrary.PlaceWorker_NotOnTerrain</li>
+        </placeWorkers>
+        <comps>
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                <IncludeRoughStone>true</IncludeRoughStone>
+                <IncludeSmoothStone>true</IncludeSmoothStone>
+                <terrainDefs>
+                    <li>MarshyTerrain</li>
+                    <li>Mud</li>
+                    <li>Marsh</li>
+                    <li>WaterDeep</li>
+                    <li>WaterShallow</li>
+                </terrainDefs>
+            </li>
+        </comps>
+    </TerrainDef>
+
+    <TerrainDef ParentName="FloorBase" Class="CommunityCoreLibrary.TerrainWithComps">
+        <DefName>TerrainOnlyOnTerrain</DefName>
+        <label>terrain only on terrain test</label>
+        <RenderPrecedence>199</RenderPrecedence>
+        <Description>Can only be placed on smoothed stone.</Description>
+        <texturePath>Terrain/Surfaces/GenericFloorTile</texturePath>
+        <color>(0.65, 0.65, 0.35)</color>
+        <CostList>
+            <Steel>1</Steel>
+        </CostList>
+        <constructEffect>ConstructMetal</constructEffect>
+        <placeWorkers>
+            <li>CommunityCoreLibrary.PlaceWorker_OnlyOnTerrain</li>
+        </placeWorkers>
+        <comps>
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                <IncludeSmoothStone>true</IncludeSmoothStone>
+            </li>
+        </comps>
+    </TerrainDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ThingDefs/Buildings_PlaceWorker_Restrictions.xml b/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ThingDefs/Buildings_PlaceWorker_Restrictions.xml
deleted file mode 100644
index c24c3c0..0000000
--- a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ThingDefs/Buildings_PlaceWorker_Restrictions.xml	
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Defs>
-
-    <ThingDef Name="BuildingBase" Abstract="True">
-        <category>Building</category>
-        <thingClass>Building</thingClass>
-        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
-        <selectable>true</selectable>
-        <drawerType>MapMeshAndRealTime</drawerType>
-        <terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
-        <repairEffect>Repair</repairEffect>
-        <leaveResourcesWhenKilled>true</leaveResourcesWhenKilled>
-        <filthLeaving>BuildingRubble</filthLeaving>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>RestrictedUnderRoof</defName>
-        <label>restricted under roof test</label>
-        <thingClass>Building</thingClass>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>115</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Restricted to being under a roof</description>
-        <costList>
-            <Steel>1</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
-        <comps>
-            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
-                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
-            </li>
-        </comps>
-        <tickerType>Rare</tickerType>
-        <placeWorkers>
-            <!-- This restriction needs a ticker to maintain -->
-            <li>CommunityCoreLibrary.PlaceWorker_OnlyUnderRoof</li>
-        </placeWorkers>
-        <designationCategory>Furniture</designationCategory>
-        <rotatable>false</rotatable>
-        <designationHotKey/>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>RestrictedCountTest</defName>
-        <label>restricted count test</label>
-        <thingClass>Building</thingClass>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>115</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Limit: 2</description>
-        <costList>
-            <Steel>1</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
-        <comps>
-            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
-                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
-                <MaxCount>2</MaxCount>
-            </li>
-        </comps>
-        <placeWorkers>
-            <!-- This restriction does not need a ticker to maintain -->
-            <li>CommunityCoreLibrary.PlaceWorker_RestrictedCount</li>
-        </placeWorkers>
-        <designationCategory>Furniture</designationCategory>
-        <rotatable>false</rotatable>
-        <designationHotKey/>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>NotOnTerrainTest</defName>
-        <label>not on terrain test</label>
-        <thingClass>Building</thingClass>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>115</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Restrictions:\nSoil\nSoilRich</description>
-        <costList>
-            <Steel>1</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
-        <comps>
-            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
-                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
-                <RestrictedTerrain>
-                    <li>Soil</li>
-                    <li>SoilRich</li>
-                </RestrictedTerrain>
-            </li>
-        </comps>
-        <terrainAffordanceNeeded>Any</terrainAffordanceNeeded>
-        <placeWorkers>
-            <!-- This restriction does not need a ticker to maintain -->
-            <li>CommunityCoreLibrary.PlaceWorker_NotOnTerrain</li>
-        </placeWorkers>
-        <designationCategory>Furniture</designationCategory>
-        <rotatable>false</rotatable>
-        <designationHotKey/>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>OnlyOnTerrainTest</defName>
-        <label>only on terrain test</label>
-        <thingClass>Building</thingClass>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>115</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Allowance:\nSand\nWaterShallow</description>
-        <costList>
-            <Steel>1</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
-        <comps>
-            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
-                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
-                <RestrictedTerrain>
-                    <li>Sand</li>
-                    <li>WaterShallow</li>
-                </RestrictedTerrain>
-            </li>
-        </comps>
-        <terrainAffordanceNeeded>Any</terrainAffordanceNeeded>
-        <placeWorkers>
-            <!-- This restriction does not need a ticker to maintain -->
-            <li>CommunityCoreLibrary.PlaceWorker_OnlyOnTerrain</li>
-        </placeWorkers>
-        <designationCategory>Furniture</designationCategory>
-        <rotatable>false</rotatable>
-        <designationHotKey/>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>NotOnThingTest</defName>
-        <label>not on thing test</label>
-        <thingClass>Building</thingClass>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>115</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Restrictions:\nSteam Geyser\nrock chunks\nslag</description>
-        <costList>
-            <Steel>1</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
-        <comps>
-            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
-                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
-                <RestrictedThing>
-                    <li>SteamGeyser</li>
-                    <li>ChunkGranite</li>
-                    <li>ChunkSandstone</li>
-                    <li>ChunkLimestone</li>
-                    <li>ChunkSlate</li>
-                    <li>ChunkMarble</li>
-                    <li>ChunkSlagSteel</li>
-                </RestrictedThing>
-            </li>
-        </comps>
-        <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
-        <placeWorkers>
-            <!-- This restriction does not need a ticker to maintain -->
-            <li>CommunityCoreLibrary.PlaceWorker_NotOnThing</li>
-        </placeWorkers>
-        <designationCategory>Furniture</designationCategory>
-        <rotatable>false</rotatable>
-        <designationHotKey/>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>OnlyOnThingTest</defName>
-        <label>only on thing test</label>
-        <thingClass>Building</thingClass>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>115</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Allowance:\nSteam Geyser\nrock chunks\nslag</description>
-        <costList>
-            <Steel>1</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
-        <comps>
-            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
-                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
-                <RestrictedThing>
-                    <li>SteamGeyser</li>
-                    <li>ChunkGranite</li>
-                    <li>ChunkSandstone</li>
-                    <li>ChunkLimestone</li>
-                    <li>ChunkSlate</li>
-                    <li>ChunkMarble</li>
-                    <li>ChunkSlagSteel</li>
-                </RestrictedThing>
-            </li>
-        </comps>
-        <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
-        <tickerType>Rare</tickerType>
-        <placeWorkers>
-            <!-- This restriction needs a ticker to maintain -->
-            <li>CommunityCoreLibrary.PlaceWorker_OnlyOnThing</li>
-        </placeWorkers>
-        <designationCategory>Furniture</designationCategory>
-        <rotatable>false</rotatable>
-        <designationHotKey/>
-    </ThingDef>
-
-</Defs>
diff --git a/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ThingDefs/PlaceWorker_Restrictions_Example.xml b/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ThingDefs/PlaceWorker_Restrictions_Example.xml
new file mode 100644
index 0000000..baebb88
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/PlaceWorkers/PlaceWorker_Restrictions/Defs/ThingDefs/PlaceWorker_Restrictions_Example.xml	
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Defs>
+
+    <ThingDef Name="BuildingBase" Abstract="True">
+        <category>Building</category>
+        <thingClass>Building</thingClass>
+        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
+        <selectable>true</selectable>
+        <drawerType>MapMeshAndRealTime</drawerType>
+        <terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
+        <repairEffect>Repair</repairEffect>
+        <leaveResourcesWhenKilled>true</leaveResourcesWhenKilled>
+        <filthLeaving>BuildingRubble</filthLeaving>
+    </ThingDef>
+
+    <ThingDef Abstract="True" Name="PlaceWorkerTestBase" ParentName="BuildingBase">
+        <thingClass>Building</thingClass>
+        <category>Building</category>
+        <minifiedDef>MinifiedFurniture</minifiedDef>
+        <altitudeLayer>Waist</altitudeLayer>
+        <passability>PassThroughOnly</passability>
+        <selectable>true</selectable>
+        <fillPercent>0.20</fillPercent>
+        <costList>
+            <Steel>1</Steel>
+        </costList>
+        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
+        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
+        <designationCategory>Furniture</designationCategory>
+        <rotatable>false</rotatable>
+        <graphicData>
+            <texPath>Things/Building/Furniture/LampStanding</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+            <shadowData>
+                <volume>(0.3, 0.6, 0.3)</volume>
+                <offset>(0,0,-0.1)</offset>
+            </shadowData>
+        </graphicData>
+        <statBases>
+            <MaxHitPoints>50</MaxHitPoints>
+            <WorkToMake>10</WorkToMake>
+            <Flammability>1.0</Flammability>
+        </statBases>
+    </ThingDef>
+
+    <ThingDef ParentName="PlaceWorkerTestBase">
+        <defName>RestrictedUnderRoof</defName>
+        <label>restricted under roof test</label>
+        <description>Restricted to being under a roof</description>
+        <comps>
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+            </li>
+        </comps>
+        <tickerType>Rare</tickerType>
+        <placeWorkers>
+            <!-- This restriction needs a ticker to maintain -->
+            <li>CommunityCoreLibrary.PlaceWorker_OnlyUnderRoof</li>
+        </placeWorkers>
+        <designationCategory>Furniture</designationCategory>
+    </ThingDef>
+
+    <ThingDef ParentName="PlaceWorkerTestBase">
+        <defName>RestrictedCountTest</defName>
+        <label>restricted count test</label>
+        <description>Limit: 2</description>
+        <comps>
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                <MaxCount>2</MaxCount>
+            </li>
+        </comps>
+        <placeWorkers>
+            <!-- This restriction does not need a ticker to maintain -->
+            <li>CommunityCoreLibrary.PlaceWorker_RestrictedCount</li>
+        </placeWorkers>
+    </ThingDef>
+
+    <ThingDef ParentName="PlaceWorkerTestBase">
+        <defName>NotOnTerrainTest</defName>
+        <label>not on terrain test</label>
+        <description>Restrictions:\nSoil\nSoilRich</description>
+        <terrainAffordanceNeeded>Any</terrainAffordanceNeeded>
+        <comps>
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                <terrainDefs>
+                    <li>Soil</li>
+                    <li>SoilRich</li>
+                </terrainDefs>
+            </li>
+        </comps>
+        <placeWorkers>
+            <!-- This restriction does not need a ticker to maintain -->
+            <li>CommunityCoreLibrary.PlaceWorker_NotOnTerrain</li>
+        </placeWorkers>
+    </ThingDef>
+
+    <ThingDef ParentName="PlaceWorkerTestBase">
+        <defName>OnlyOnTerrainTest</defName>
+        <label>only on terrain test</label>
+        <description>Allowance:\nSand\nWaterShallow</description>
+        <terrainAffordanceNeeded>Any</terrainAffordanceNeeded>
+        <comps>
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                <terrainDefs>
+                    <li>Sand</li>
+                    <li>WaterShallow</li>
+                </terrainDefs>
+            </li>
+        </comps>
+        <placeWorkers>
+            <!-- This restriction does not need a ticker to maintain -->
+            <li>CommunityCoreLibrary.PlaceWorker_OnlyOnTerrain</li>
+        </placeWorkers>
+    </ThingDef>
+
+    <ThingDef ParentName="PlaceWorkerTestBase">
+        <defName>NotOnThingTest</defName>
+        <label>not on thing test</label>
+        <description>Restrictions:\nSteam Geyser\nrock chunks\nslag</description>
+        <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
+        <comps>
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                <thingDefs>
+                    <li>SteamGeyser</li>
+                    <li>ChunkGranite</li>
+                    <li>ChunkSandstone</li>
+                    <li>ChunkLimestone</li>
+                    <li>ChunkSlate</li>
+                    <li>ChunkMarble</li>
+                    <li>ChunkSlagSteel</li>
+                </thingDefs>
+            </li>
+        </comps>
+        <placeWorkers>
+            <!-- This restriction does not need a ticker to maintain -->
+            <li>CommunityCoreLibrary.PlaceWorker_NotOnThing</li>
+        </placeWorkers>
+    </ThingDef>
+
+    <ThingDef ParentName="PlaceWorkerTestBase">
+        <defName>OnlyOnThingTest</defName>
+        <label>only on thing test</label>
+        <description>Allowance:\nSteam Geyser\nrock chunks\nslag</description>
+        <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
+        <comps>
+            <li Class="CommunityCoreLibrary.RestrictedPlacement_Properties">
+                <compClass>CommunityCoreLibrary.RestrictedPlacement_Comp</compClass>
+                <thingDefs>
+                    <li>SteamGeyser</li>
+                    <li>ChunkGranite</li>
+                    <li>ChunkSandstone</li>
+                    <li>ChunkLimestone</li>
+                    <li>ChunkSlate</li>
+                    <li>ChunkMarble</li>
+                    <li>ChunkSlagSteel</li>
+                </thingDefs>
+            </li>
+        </comps>
+        <tickerType>Rare</tickerType>
+        <placeWorkers>
+            <!-- This restriction needs a ticker to maintain -->
+            <li>CommunityCoreLibrary.PlaceWorker_OnlyOnThing</li>
+        </placeWorkers>
+    </ThingDef>
+
+</Defs>
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/About/About.xml b/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/About/About.xml
index 6e8e0cb..f7dc438 100644
--- a/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/About/About.xml	
+++ b/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/About/About.xml	
@@ -3,7 +3,7 @@
     <name>Refigerated Meal Shelf</name>
     <author>RimWorld CCL Team</author>
     <url>n/a</url>
-    <targetVersion>Community Core Library v0.11.2</targetVersion>
+    <targetVersion>Community Core Library v0.12.0</targetVersion>
     <description>
 	This is an example of a simple refrigerated meal shelf.
 
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/CCLVersionDefs/CCLVersion.xml b/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/CCLVersionDefs/CCLVersion.xml
deleted file mode 100644
index 40d06e2..0000000
--- a/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/CCLVersionDefs/CCLVersion.xml	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] SomeUniqueIdentifierInClass
-        
-        <ModName>string</ModName>       [required] Name of your mod
-        
-        <version>version</version>      [required] Minimum version of CCL required
-    -->
-
-    <CCLVersionDef>
-        <defName>RefigeratedMealShelfVersion</defName>
-        <ModName>Modders Resource: Refrigerated Meal Shelf</ModName>
-        <version>0.11.2</version>
-    </CCLVersionDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ModHelperDefs/Refrigerated_Meal_Shelf.xml b/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ModHelperDefs/Refrigerated_Meal_Shelf.xml
new file mode 100644
index 0000000..2517012
--- /dev/null
+++ b/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ModHelperDefs/Refrigerated_Meal_Shelf.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <ModHelperDef>
+        <defName>RefigeratedMealShelfVersion</defName>
+
+        <ModName>Modders Resource: Refrigerated Meal Shelf</ModName>
+
+        <version>0.12.0</version>
+
+    </ModHelperDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ThingDefs/Buildings_Refrigerated_Meal_Shelf.xml b/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ThingDefs/Refrigerated_Meal_Shelf.xml
similarity index 98%
rename from _Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ThingDefs/Buildings_Refrigerated_Meal_Shelf.xml
rename to _Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ThingDefs/Refrigerated_Meal_Shelf.xml
index 1cd4910..8f5a069 100644
--- a/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ThingDefs/Buildings_Refrigerated_Meal_Shelf.xml	
+++ b/_Mod/Modders Resource/Examples/ThingComps/Refrigerated Meal Shelf/Defs/ThingDefs/Refrigerated_Meal_Shelf.xml	
@@ -37,7 +37,7 @@
         </costList>
         <statBases>
             <MaxHitPoints>100</MaxHitPoints>
-            <WorkToMake>700</WorkToMake>
+            <WorkToMake>1200</WorkToMake>
             <Flammability>1.0</Flammability>
         </statBases>
         <description>Haulers carry meals here for storage without rotting.</description>
diff --git a/_Mod/User Release/Community Core Library - Vanilla Tweaks/About/About.xml b/_Mod/User Release/Community Core Library - Vanilla Tweaks/About/About.xml
new file mode 100644
index 0000000..a41b9ff
--- /dev/null
+++ b/_Mod/User Release/Community Core Library - Vanilla Tweaks/About/About.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ModMetaData>
+
+    <name>Community Core Library - Vanilla Tweaks</name>
+
+    <author>RimWorld CCL Team</author>
+
+    <url>https://ludeon.com/forums/index.php?topic=14172.0</url>
+
+    <targetVersion>Community Core Library v0.12.0</targetVersion>
+
+    <description>Makes optional changes to the core game objects.\n\nUnless a dependant mod has explicitly requested you not to, you should enable this.</description>
+
+</ModMetaData>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Artillery.xml b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Artillery.xml
new file mode 100644
index 0000000..719c960
--- /dev/null
+++ b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Artillery.xml	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <AdvancedResearchDef>
+
+        <defName>MakeArtilleryShellsSmithingTable</defName>
+        <Priority>0</Priority>
+
+        <researchDefs>
+            <li>Mortars</li>
+        </researchDefs>
+
+        <recipeDefs>
+            <li>MakeArtilleryShellSmithingTable</li>
+        </recipeDefs>
+
+        <thingDefs>
+            <li>TableSmithing</li>
+        </thingDefs>
+
+    </AdvancedResearchDef>
+
+    <AdvancedResearchDef>
+
+        <defName>MakeArtilleryShellsMachiningTable</defName>
+        <Priority>0</Priority>
+
+        <researchDefs>
+            <li>Mortars</li>
+        </researchDefs>
+
+        <recipeDefs>
+            <li>MakeArtilleryShell</li>
+        </recipeDefs>
+
+        <thingDefs>
+            <li>TableMachining</li>
+        </thingDefs>
+
+    </AdvancedResearchDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Plants.xml b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Plants.xml
new file mode 100644
index 0000000..59e416d
--- /dev/null
+++ b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/AdvancedResearchDefs/AdvancedResearch_Plants.xml	
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <AdvancedResearchDef>
+
+        <defName>PlantHops</defName>
+        <Priority>0</Priority>
+
+        <researchDefs>
+            <li>Brewing</li>
+        </researchDefs>
+
+        <sowTags>
+            <li>Ground</li>
+            <li>Hydroponic</li>
+        </sowTags>
+
+        <thingDefs>
+            <li>PlantHops</li>
+        </thingDefs>
+
+    </AdvancedResearchDef>
+
+    <AdvancedResearchDef>
+
+        <defName>PlantXerigium</defName>
+        <Priority>0</Priority>
+
+        <researchDefs>
+            <li>HospitalBed</li>
+        </researchDefs>
+
+        <sowTags>
+            <li>Ground</li>
+            <li>Hydroponic</li>
+        </sowTags>
+
+        <thingDefs>
+            <li>PlantXerigium</li>
+        </thingDefs>
+
+    </AdvancedResearchDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/ModHelperDefs/ModHelper_Core.xml b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/ModHelperDefs/ModHelper_Core.xml
new file mode 100644
index 0000000..eb8359f
--- /dev/null
+++ b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/ModHelperDefs/ModHelper_Core.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <ModHelperDef>
+        <defName>CommunityCoreLibrary</defName>
+        
+        <ModName>Community Core Library</ModName>
+        
+        <version>0.12.0</version>
+        
+        <MapComponents>
+            <li>CommunityCoreLibrary.ResearchController</li>
+        </MapComponents>
+        
+    </ModHelperDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/RecipeDefs/Recipes_ArtilleryShells.xml b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/RecipeDefs/Recipes_ArtilleryShells.xml
new file mode 100644
index 0000000..5a621c2
--- /dev/null
+++ b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/RecipeDefs/Recipes_ArtilleryShells.xml	
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <RecipeDef>
+        <defName>MakeArtilleryShellSmithingTable</defName>
+        <label>make artillery shell</label>
+        <description>Craft an artillery shell.</description>
+        <jobString>Making artillery shell.</jobString>
+        <workSpeedStat>SmithingSpeed</workSpeedStat>
+        <effectWorking>Cook</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <allowMixingIngredients>true</allowMixingIngredients>
+        <workAmount>1200</workAmount>
+        <targetCountAdjustment>5</targetCountAdjustment>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>Steel</li>
+                    </thingDefs>
+                </filter>
+                <count>10</count>
+            </li>
+        </ingredients>
+        <fixedIngredientFilter>
+            <thingDefs>
+                <li>Steel</li>
+            </thingDefs>
+        </fixedIngredientFilter>
+        <products>
+            <ArtilleryShell>1</ArtilleryShell>
+        </products>
+        <workSkill>Crafting</workSkill>
+    </RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Lights.xml b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Lights.xml
new file mode 100644
index 0000000..7ab92f5
--- /dev/null
+++ b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Lights.xml	
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Defs>
+
+    <ThingDef Name="BuildingBase" Abstract="True">
+        <category>Building</category>
+        <thingClass>Building</thingClass>
+        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
+        <selectable>true</selectable>
+        <drawerType>MapMeshAndRealTime</drawerType>
+        <terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
+        <repairEffect>Repair</repairEffect>
+        <leaveResourcesWhenKilled>true</leaveResourcesWhenKilled>
+        <filthLeaving>BuildingRubble</filthLeaving>
+    </ThingDef>
+
+    <ThingDef Abstract="True" Name="StandingLampBase" ParentName="BuildingBase">
+        <thingClass>Building</thingClass>
+        <category>Building</category>
+        <minifiedDef>MinifiedFurniture</minifiedDef>
+        <altitudeLayer>Waist</altitudeLayer>
+        <passability>PassThroughOnly</passability>
+        <selectable>true</selectable>
+        <fillPercent>0.20</fillPercent>
+        <costList>
+            <Steel>15</Steel>
+        </costList>
+        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
+        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
+        <designationCategory>Furniture</designationCategory>
+        <rotatable>false</rotatable>
+        <graphicData>
+            <texPath>Things/Building/Furniture/LampStanding</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+            <shadowData>
+                <volume>(0.3, 0.6, 0.3)</volume>
+                <offset>(0,0,-0.1)</offset>
+            </shadowData>
+        </graphicData>
+        <comps>
+            <li>
+                <compClass>CompPowerTrader</compClass>
+                <basePowerConsumption>150</basePowerConsumption>
+                <shortCircuitInRain>false</shortCircuitInRain>
+                <soundPowerOn>PowerOnSmall</soundPowerOn>
+                <soundPowerOff>PowerOffSmall</soundPowerOff>
+            </li>
+            <li>
+                <compClass>CompQuality</compClass>
+            </li>
+            <li>
+                <compClass>CompGlower</compClass>
+                <glowRadius>12</glowRadius>
+                <glowColor>(217,217,208,0)</glowColor>
+            </li>
+            <li Class="CommunityCoreLibrary.CompProperties_ColoredLight">
+                <compClass>CommunityCoreLibrary.CompColoredLight</compClass>
+            </li>
+        </comps>
+        <statBases>
+            <MaxHitPoints>50</MaxHitPoints>
+            <WorkToMake>170</WorkToMake>
+            <Flammability>1.0</Flammability>
+        </statBases>
+    </ThingDef>
+
+
+    <ThingDef ParentName="StandingLampBase" >
+        <defName>StandingLamp</defName>
+        <label>standing lamp</label>
+        <description>Standing lamp that lights an area.</description>
+        <designationHotKey>L</designationHotKey>
+    </ThingDef>
+
+    <ThingDef ParentName="StandingLampBase">
+        <defName>StandingLamp_Red</defName>
+        <label>standing lamp (red)</label>
+        <designationHotKey>O</designationHotKey>
+        <description>Standing lamp that lights an area in red.</description>
+        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
+    </ThingDef>
+
+    <ThingDef ParentName="StandingLampBase">
+        <defName>StandingLamp_Green</defName>
+        <label>standing lamp (green)</label>
+        <description>Standing lamp that lights an area in green.</description>
+        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
+    </ThingDef>
+
+    <ThingDef ParentName="StandingLampBase">
+        <defName>StandingLamp_Blue</defName>
+        <label>standing lamp (blue)</label>
+        <description>Standing lamp that lights an area in blue.</description>
+        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
+    </ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Defs/ThingDefs/Buildings_Production.xml b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Production.xml
similarity index 90%
rename from _Mod/User Release/Community Core Library/Defs/ThingDefs/Buildings_Production.xml
rename to _Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Production.xml
index 4d79654..b314b06 100644
--- a/_Mod/User Release/Community Core Library/Defs/ThingDefs/Buildings_Production.xml	
+++ b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Production.xml	
@@ -23,14 +23,13 @@
         </graphicData>
         <altitudeLayer>BuildingTall</altitudeLayer>
         <passability>Impassable</passability>
-        <castEdgeShadows>true</castEdgeShadows>
         <fillPercent>1</fillPercent>
         <statBases>
             <WorkToMake>2200</WorkToMake>
             <MaxHitPoints>350</MaxHitPoints>
             <Flammability>1.0</Flammability>
         </statBases>
-        <description>Synthesizes nutrient paste from organic feedstocks. It consumes less ingredients and time than any other meal production method - but nobody likes eating nutrient paste.</description>
+        <description>Synthesizes nutrient paste from organic feedstocks. It consumes less ingredients and time than any other meal production method - but nobody likes eating nutrient paste. Accepts raw food, but not rough plant matter like hay.</description>
         <building>
             <isMealSource>true</isMealSource>
             <wantsHopperAdjacent>true</wantsHopperAdjacent>
@@ -59,20 +58,24 @@
         <hasInteractionCell>true</hasInteractionCell>
         <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
         <designationCategory>Production</designationCategory>
-        <staticSunShadowHeight>0.75</staticSunShadowHeight>
         <constructEffect>ConstructMetal</constructEffect>
         <designationHotKey>N</designationHotKey>
     </ThingDef>
 
-    <ThingDef ParentName="BuildingBase">
+    <ThingDef Name="BenchBase" ParentName="BuildingBase" Abstract="True">
+        <castEdgeShadows>true</castEdgeShadows>
+        <staticSunShadowHeight>0.20</staticSunShadowHeight>
+    </ThingDef>
+
+    <ThingDef ParentName="BenchBase">
         <DefName>TableTailor</DefName>
         <label>tailor's workbench</label>
         <ThingClass>Building_WorkTable</ThingClass>
         <Description>A workbench equipped for cloth refinement and clothing production.</Description>
         <graphicData>
             <texPath>Things/Building/Production/TableTailor</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <drawSize>(3,1)</drawSize>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(3.5,1.5)</drawSize>
         </graphicData>
         <costStuffCount>75</costStuffCount>
         <CostList>
@@ -112,22 +115,31 @@
                 <soundPowerOn>PowerOnSmall</soundPowerOn>
                 <soundPowerOff>PowerOffSmall</soundPowerOff>
             </li>
+            <li>
+                <compClass>CompAffectedByFacilities</compClass>
+                <linkableFacilities>
+                    <li>ToolCabinet</li>
+                </linkableFacilities>
+            </li>
             <li Class="CommunityCoreLibrary.CompProperties_LowIdleDraw">
                 <compClass>CommunityCoreLibrary.CompPowerLowIdleDraw</compClass>
             </li>
         </comps>
         <designationHotKey>P</designationHotKey>
+        <placeWorkers>
+            <li>PlaceWorker_ShowFacilitiesConnections</li>
+        </placeWorkers>
     </ThingDef>
 
-    <ThingDef ParentName="BuildingBase">
+    <ThingDef ParentName="BenchBase">
         <DefName>TableSmithing</DefName>
         <label>smithing bench</label>
         <ThingClass>Building_WorkTable</ThingClass>
         <Description>A workbench equipped for weapons and tools production.</Description>
         <graphicData>
             <texPath>Things/Building/Production/TableSmithing</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <drawSize>(3,1)</drawSize>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(3.5,1.5)</drawSize>
         </graphicData>
         <CostList>
             <WoodLog>40</WoodLog>
@@ -141,6 +153,7 @@
             <WorkToMake>3000</WorkToMake>
             <MaxHitPoints>180</MaxHitPoints>
             <Flammability>1.0</Flammability>
+            <Cleanliness>-3</Cleanliness>
         </statBases>
         <Size>(3,1)</Size>
         <DesignationCategory>Production</DesignationCategory>
@@ -164,6 +177,12 @@
                 <soundPowerOn>PowerOnSmall</soundPowerOn>
                 <soundPowerOff>PowerOffSmall</soundPowerOff>
             </li>
+            <li>
+                <compClass>CompAffectedByFacilities</compClass>
+                <linkableFacilities>
+                    <li>ToolCabinet</li>
+                </linkableFacilities>
+            </li>
             <li Class="CommunityCoreLibrary.CompProperties_LowIdleDraw">
                 <compClass>CommunityCoreLibrary.CompPowerLowIdleDraw</compClass>
             </li>
@@ -174,17 +193,20 @@
             </li>
         </comps>
         <designationHotKey>M</designationHotKey>
+        <placeWorkers>
+            <li>PlaceWorker_ShowFacilitiesConnections</li>
+        </placeWorkers>
     </ThingDef>
 
-    <ThingDef ParentName="BuildingBase">
+    <ThingDef ParentName="BenchBase">
         <DefName>TableMachining</DefName>
         <label>machining table</label>
         <ThingClass>Building_WorkTable</ThingClass>
         <Description>A table and tools for assembling and disassembling machine components like mechanoids bodies and ammunition.</Description>
         <graphicData>
             <texPath>Things/Building/Production/TableMachining</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <drawSize>(3,1)</drawSize>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(3.5,1.5)</drawSize>
         </graphicData>
         <CostList>
             <Steel>150</Steel>
@@ -196,6 +218,7 @@
             <WorkToMake>3000</WorkToMake>
             <MaxHitPoints>180</MaxHitPoints>
             <Flammability>1.0</Flammability>
+            <Cleanliness>-2</Cleanliness>
         </statBases>
         <Size>(3,1)</Size>
         <DesignationCategory>Production</DesignationCategory>
@@ -211,6 +234,7 @@
         <inspectorTabs>
             <li>ITab_Bills</li>
         </inspectorTabs>
+        <tickerType>Normal</tickerType>
         <comps>
             <li>
                 <compClass>CompPowerTrader</compClass>
@@ -227,25 +251,33 @@
                 <glowRadius>5</glowRadius>
                 <glowColor>(73,123,138,0)</glowColor>
             </li>
+            <li>
+                <compClass>CompAffectedByFacilities</compClass>
+                <linkableFacilities>
+                    <li>ToolCabinet</li>
+                </linkableFacilities>
+            </li>
         </comps>
         <building>
             <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
         </building>
-        <tickerType>Normal</tickerType>
         <constructEffect>ConstructMetal</constructEffect>
         <researchPrerequisite>Machining</researchPrerequisite>
         <designationHotKey>I</designationHotKey>
+        <placeWorkers>
+            <li>PlaceWorker_ShowFacilitiesConnections</li>
+        </placeWorkers>
     </ThingDef>
 
-    <ThingDef ParentName="BuildingBase">
+    <ThingDef ParentName="BenchBase">
         <defName>CookStove</defName>
         <label>cook stove</label>
         <ThingClass>Building_WorkTable_HeatPush</ThingClass>
         <Description>A simple stove and attached countertop for preparing meals.</Description>
         <graphicData>
             <texPath>Things/Building/Production/TableCookStove</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <drawSize>(3,1)</drawSize>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(3.5,1.5)</drawSize>
         </graphicData>
         <constructEffect>ConstructMetal</constructEffect>
         <CostList>
@@ -274,6 +306,7 @@
         <inspectorTabs>
             <li>ITab_Bills</li>
         </inspectorTabs>
+        <tickerType>Normal</tickerType>
         <comps>
             <li>
                 <compClass>CompPowerTrader</compClass>
@@ -296,19 +329,18 @@
             <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
             <heatPerTickWhileWorking>0.25</heatPerTickWhileWorking>
         </building>
-        <tickerType>Normal</tickerType>
         <designationHotKey>O</designationHotKey>
     </ThingDef>
 
-    <ThingDef ParentName="BuildingBase">
+    <ThingDef ParentName="BenchBase">
         <DefName>ElectricSmelter</DefName>
         <label>electric smelter</label>
         <ThingClass>Building_WorkTable_HeatPush</ThingClass>
         <Description>Extracts usable metal from slag chunks and other mixed metal items. Consumes a lot of power.</Description>
         <graphicData>
             <texPath>Things/Building/Production/ElectricSmelter</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <drawSize>(3,1)</drawSize>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <drawSize>(3.5,1.5)</drawSize>
         </graphicData>
         <constructEffect>ConstructMetal</constructEffect>
         <CostList>
@@ -336,6 +368,7 @@
         <inspectorTabs>
             <li>ITab_Bills</li>
         </inspectorTabs>
+        <tickerType>Normal</tickerType>
         <comps>
             <li>
                 <compClass>CompPowerTrader</compClass>
@@ -360,7 +393,6 @@
             <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
             <heatPerTickWhileWorking>0.5</heatPerTickWhileWorking>
         </building>
-        <tickerType>Normal</tickerType>
         <researchPrerequisite>ElectricSmelting</researchPrerequisite>
         <designationHotKey>L</designationHotKey>
     </ThingDef>
@@ -389,6 +421,7 @@
             <WorkToMake>4500</WorkToMake>
             <MaxHitPoints>300</MaxHitPoints>
             <Flammability>0</Flammability>
+            <Cleanliness>-20</Cleanliness>
         </statBases>
         <Size>(3,2)</Size>
         <DesignationCategory>Production</DesignationCategory>
@@ -404,6 +437,7 @@
         <inspectorTabs>
             <li>ITab_Bills</li>
         </inspectorTabs>
+        <tickerType>Normal</tickerType>
         <comps>
             <li>
                 <compClass>CompPowerTrader</compClass>
@@ -430,7 +464,6 @@
             <spawnedConceptLearnOpportunity>BillsTab</spawnedConceptLearnOpportunity>
             <heatPerTickWhileWorking>0.6</heatPerTickWhileWorking>
         </building>
-        <tickerType>Normal</tickerType>
         <researchPrerequisite>Cremation</researchPrerequisite>
         <designationHotKey>K</designationHotKey>
     </ThingDef>
@@ -451,10 +484,12 @@
         <pathCost>60</pathCost>
         <castEdgeShadows>true</castEdgeShadows>
         <constructEffect>ConstructMetal</constructEffect>
+        <fillPercent>0.30</fillPercent>
         <statBases>
             <WorkToMake>2800</WorkToMake>
             <MaxHitPoints>180</MaxHitPoints>
             <Flammability>1.0</Flammability>
+            <Cleanliness>-3</Cleanliness>
         </statBases>
         <description>For growing food. Hydroponics basins grow a few plants quickly. The basin requires power to work, and plants will die if power is cut.</description>
         <size>(1,4)</size>
@@ -493,7 +528,6 @@
         <researchPrerequisite>Hydroponics</researchPrerequisite>
         <terrainAffordanceNeeded>Heavy</terrainAffordanceNeeded>
         <designationCategory>Production</designationCategory>
-        <!--<staticSunShadowHeight>0.03</staticSunShadowHeight>-->
         <designationHotKey>Y</designationHotKey>
     </ThingDef>
 
diff --git a/_Mod/User Release/Community Core Library/Defs/ThingDefs/Buildings_Structure.xml b/_Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Structure.xml
similarity index 100%
rename from _Mod/User Release/Community Core Library/Defs/ThingDefs/Buildings_Structure.xml
rename to _Mod/User Release/Community Core Library - Vanilla Tweaks/Defs/ThingDefs/Buildings_Structure.xml
diff --git a/_Mod/User Release/Community Core Library/About/About.xml b/_Mod/User Release/Community Core Library/About/About.xml
index 9fee98e..e79a0f2 100644
--- a/_Mod/User Release/Community Core Library/About/About.xml	
+++ b/_Mod/User Release/Community Core Library/About/About.xml	
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
-    <name>Community Core Library v0.11.5</name>
+
+    <name>Community Core Library v0.12.0</name>
+
     <author>RimWorld CCL Team</author>
+
     <url>https://ludeon.com/forums/index.php?topic=14172.0</url>
-    <targetVersion>RimWorld Alpha 11d</targetVersion>
-    <description>Provides a common core set of library functions for modders as well as making the necessary core compatibility changes.</description>
+
+    <targetVersion>RimWorld Alpha 12</targetVersion>
+
+    <description>Provides a common core set of library functions for modders as well as making required core changes.\n\nThis must be loaded immediately after "Core" unless another mod explicitly tells you to load it between "Core" this mod.</description>
+
 </ModMetaData>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Assemblies/Community Core Library.dll b/_Mod/User Release/Community Core Library/Assemblies/Community Core Library.dll
index 7bedf52..c8e7fe5 100644
Binary files a/_Mod/User Release/Community Core Library/Assemblies/Community Core Library.dll and b/_Mod/User Release/Community Core Library/Assemblies/Community Core Library.dll differ
diff --git a/_Mod/User Release/Community Core Library/Defs/AdvancedResearchDefs/AdvancedResearch_Core.xml b/_Mod/User Release/Community Core Library/Defs/AdvancedResearchDefs/AdvancedResearch_Core.xml
deleted file mode 100644
index dd40a93..0000000
--- a/_Mod/User Release/Community Core Library/Defs/AdvancedResearchDefs/AdvancedResearch_Core.xml	
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] Some unique identifier in class
-        <Priority>int</Priority>        [required] Lower values is happen first
-        
-        <researchDefs>                  [required] All the research listed must be complete for anything to happen
-            <li>ResearchProjectDef</li>
-        </researchDefs>
-        
-        <HideDefs>bool</HideDefs>       [optional: false] Set to true to disable (hide) or false to enable
-        
-        <recipeDefs>                    [optional: null] Recipes to toggle on buildings, requires <thingDefs>
-            <li>RecipeDef</li>          with <thingClass> implementing "IBillGiver"
-        </recipeDef>
-        
-        <sowTags>                       [optional: null] Plant sowTags to toggle, requires <thingDefs> with
-            <li>string</li>             <thingClass> "Plant"
-        </sowTags>
-        
-        <thingsDefs>                    [optional: null] The things to effect depending on other tags,
-            <li>ThingDef</li>           If no other dependant tags exist, toggles buildings in the architect tabs
-        </thingDefs>                    with a valid <designationCategory> (must not be null or "None")
-        
-        <effectedResearchDefs>          [optional: null] Research projects to unlock or lock, can be used to
-            <li>ResearchProjectDef</li> create exclusive branches of research
-        </effectedResearchDefs>
-        
-        <researchMods>                  [optional: null] Mod callback Actions, these will happen after everything else has been processed
-            <li>Action</li>
-        </researchMods>
-    -->
-
-    <AdvancedResearchDef>
-
-        <defName>MakeArtilleryShells</defName>
-        <Priority>0</Priority>
-
-        <researchDefs>
-            <li>Mortars</li>
-            <li>Machining</li>
-        </researchDefs>
-
-        <recipeDefs>
-            <li>MakeArtilleryShell</li>
-        </recipeDefs>
-
-        <thingDefs>
-            <li>TableMachining</li>
-        </thingDefs>
-
-    </AdvancedResearchDef>
-
-    <AdvancedResearchDef>
-
-        <defName>PlantHops</defName>
-        <Priority>0</Priority>
-
-        <researchDefs>
-            <li>Brewing</li>
-        </researchDefs>
-
-        <sowTags>
-            <li>Ground</li>
-            <li>Hydroponic</li>
-        </sowTags>
-
-        <thingDefs>
-            <li>PlantHops</li>
-        </thingDefs>
-
-    </AdvancedResearchDef>
-
-    <AdvancedResearchDef>
-
-        <defName>PlantXerigium</defName>
-        <Priority>0</Priority>
-
-        <researchDefs>
-            <li>HospitalBed</li>
-        </researchDefs>
-
-        <sowTags>
-            <li>Ground</li>
-            <li>Hydroponic</li>
-        </sowTags>
-
-        <thingDefs>
-            <li>PlantXerigium</li>
-        </thingDefs>
-
-    </AdvancedResearchDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Defs/CCLVersionDefs/CCLVersion.xml b/_Mod/User Release/Community Core Library/Defs/CCLVersionDefs/CCLVersion.xml
deleted file mode 100644
index 5373e79..0000000
--- a/_Mod/User Release/Community Core Library/Defs/CCLVersionDefs/CCLVersion.xml	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <!--
-        <defName>string</defName>       [required] SomeUniqueIdentifierInClass
-        
-        <ModName>string</ModName>       [required] Name of your mod
-        
-        <version>version</version>      [required] Minimum version of CCL required
-    -->
-
-    <CCLVersionDef>
-        <defName>CCLVersion</defName>
-        <ModName>Community Core Library</ModName>
-        <version>0.11.5</version>
-    </CCLVersionDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Defs/HelpCategoryDefs/HelpCategory_Gizmos.xml b/_Mod/User Release/Community Core Library/Defs/HelpCategoryDefs/HelpCategory_Gizmos.xml
new file mode 100644
index 0000000..6148935
--- /dev/null
+++ b/_Mod/User Release/Community Core Library/Defs/HelpCategoryDefs/HelpCategory_Gizmos.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <HelpCategoryDef>
+
+        <defName>GizmoHelp</defName>
+
+        <ModName>Community Core Library</ModName>
+
+        <label>Gizmos</label>
+
+    </HelpCategoryDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/Modders Resource/Community Core Library/Defs/HelpDefs/HelpDefs.xml b/_Mod/User Release/Community Core Library/Defs/HelpDefs/HelpDefs_Gizmos.xml
similarity index 53%
rename from _Mod/Modders Resource/Community Core Library/Defs/HelpDefs/HelpDefs.xml
rename to _Mod/User Release/Community Core Library/Defs/HelpDefs/HelpDefs_Gizmos.xml
index dfffb1f..08eb4b2 100644
--- a/_Mod/Modders Resource/Community Core Library/Defs/HelpDefs/HelpDefs.xml	
+++ b/_Mod/User Release/Community Core Library/Defs/HelpDefs/HelpDefs_Gizmos.xml	
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-    <!--
-        <defName>string</defName>       [required] Some unique identifier in class
-        
-        <category>string</category>     [required] defName of category help topic
-        
-        <label>string</label>           [required] Title of help topic
-        
-        <description>string</description> [required] Information to tell the player
-    -->
-
     <HelpDef>
-        <defName>CCLColoredLights</defName>
-        <category>CCLGizmoHelp</category>
+        <defName>ColoredLights</defName>
+
+        <category>GizmoHelp</category>
+
         <label>Colored Lights</label>
+
         <description>Buildings which support colored lights will offer buttons to change the light color as well as share the color with other lights when the appropriate research is complete.</description>
+
     </HelpDef>
 
     <HelpDef>
-        <defName>CCLNeighbourlyGrowers</defName>
-        <category>CCLGizmoHelp</category>
+        <defName>NeighbourlyGrowers</defName>
+
+        <category>GizmoHelp</category>
+
         <label>Neighbourly Growers</label>
+
         <description>Hydroponics which are neighbourly growers support sharing the sowed plant with other neighbourly growers allowing you to set one building and then use a button to share it.</description>
+
     </HelpDef>
 
 </Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Defs/MainTabDefs/MainTabs.xml b/_Mod/User Release/Community Core Library/Defs/MainTabDefs/MainTabs.xml
new file mode 100644
index 0000000..ae296d3
--- /dev/null
+++ b/_Mod/User Release/Community Core Library/Defs/MainTabDefs/MainTabs.xml	
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<MainTabDefs>
+    
+  <MainTabDef Class="CommunityCoreLibrary.MainTab_HelpMenuDef">
+    <defName>CCL_ModHelp</defName>
+    <label>Help</label>
+    <description>Get help with different mods.</description>
+    <windowClass>CommunityCoreLibrary.MainTabWindow_ModHelp</windowClass>
+    <order>81</order>
+    <windowSize>(700,500)</windowSize>
+    <listWidth>200</listWidth>
+    <pauseGame>false</pauseGame>
+  </MainTabDef>
+
+</MainTabDefs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Defs/ModHelperDefs/ModHelper.xml b/_Mod/User Release/Community Core Library/Defs/ModHelperDefs/ModHelper.xml
new file mode 100644
index 0000000..92a3c96
--- /dev/null
+++ b/_Mod/User Release/Community Core Library/Defs/ModHelperDefs/ModHelper.xml	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <ModHelperDef>
+        <defName>CommunityCoreLibrary</defName>
+
+        <ModName>Community Core Library</ModName>
+
+        <version>0.12.0</version>
+
+        <MapComponents>
+            <li>CommunityCoreLibrary.ResearchController</li>
+        </MapComponents>
+
+    </ModHelperDef>
+
+</Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Defs/ResearchProjectDefs/Research_Locker.xml b/_Mod/User Release/Community Core Library/Defs/ResearchProjectDefs/Research_Locker.xml
index 1434027..825cfe0 100644
--- a/_Mod/User Release/Community Core Library/Defs/ResearchProjectDefs/Research_Locker.xml	
+++ b/_Mod/User Release/Community Core Library/Defs/ResearchProjectDefs/Research_Locker.xml	
@@ -3,13 +3,17 @@
 
     <ResearchProjectDef>
         <defName>CommunityCoreLibraryResearchLocker</defName>
-        <label>this should be hidden</label>
-        <description>This should never be seen.</description>
-        <descriptionDiscovered>How did it come to this?</descriptionDiscovered>
+
+        <label>.</label>
+        <description>.</description>
+        <descriptionDiscovered>?</descriptionDiscovered>
+
         <totalCost>1</totalCost>
+
         <prerequisites>
             <li>CommunityCoreLibraryResearchLocker</li>
         </prerequisites>
+
     </ResearchProjectDef>
 
 </Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Defs/ThingDefs/Buildings_Lights.xml b/_Mod/User Release/Community Core Library/Defs/ThingDefs/Buildings_Lights.xml
deleted file mode 100644
index e4e7867..0000000
--- a/_Mod/User Release/Community Core Library/Defs/ThingDefs/Buildings_Lights.xml	
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Defs>
-
-    <ThingDef Name="BuildingBase" Abstract="True">
-        <category>Building</category>
-        <thingClass>Building</thingClass>
-        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
-        <selectable>true</selectable>
-        <drawerType>MapMeshAndRealTime</drawerType>
-        <terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
-        <repairEffect>Repair</repairEffect>
-        <leaveResourcesWhenKilled>true</leaveResourcesWhenKilled>
-        <filthLeaving>BuildingRubble</filthLeaving>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>StandingLamp</defName>
-        <label>standing lamp</label>
-        <thingClass>Building</thingClass>
-        <category>Building</category>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>115</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Standing lamp that lights an area.</description>
-        <costList>
-            <Steel>15</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <soundImpactDefault>BulletImpactMetal</soundImpactDefault>
-        <comps>
-            <li>
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>150</basePowerConsumption>
-                <shortCircuitInRain>false</shortCircuitInRain>
-                <soundPowerOn>PowerOnSmall</soundPowerOn>
-                <soundPowerOff>PowerOffSmall</soundPowerOff>
-            </li>
-            <li>
-                <compClass>CompGlower</compClass>
-                <glowRadius>12</glowRadius>
-                <glowColor>(217,217,208,0)</glowColor>
-            </li>
-            <li Class="CommunityCoreLibrary.CompProperties_ColoredLight">
-                <compClass>CommunityCoreLibrary.CompColoredLight</compClass>
-            </li>
-        </comps>
-        <designationCategory>Furniture</designationCategory>
-        <rotatable>false</rotatable>
-        <designationHotKey>L</designationHotKey>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>StandingLamp_Red</defName>
-        <label>standing lamp (red)</label>
-        <thingClass>Building</thingClass>
-        <category>Building</category>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>130</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Standing lamp that lights an area in red.</description>
-        <costList>
-            <Steel>15</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <comps>
-            <li>
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>150</basePowerConsumption>
-                <shortCircuitInRain>false</shortCircuitInRain>
-                <soundPowerOn>PowerOnSmall</soundPowerOn>
-                <soundPowerOff>PowerOffSmall</soundPowerOff>
-            </li>
-            <li>
-                <compClass>CompGlower</compClass>
-                <glowRadius>12</glowRadius>
-                <glowColor>(217,0,0,0)</glowColor>
-            </li>
-        </comps>
-        <designationCategory>None</designationCategory>
-        <rotatable>false</rotatable>
-        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>StandingLamp_Green</defName>
-        <label>standing lamp (green)</label>
-        <thingClass>Building</thingClass>
-        <category>Building</category>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>130</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Standing lamp that lights an area in green.</description>
-        <costList>
-            <Steel>15</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <comps>
-            <li>
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>150</basePowerConsumption>
-                <shortCircuitInRain>false</shortCircuitInRain>
-                <soundPowerOn>PowerOnSmall</soundPowerOn>
-                <soundPowerOff>PowerOffSmall</soundPowerOff>
-            </li>
-            <li>
-                <compClass>CompGlower</compClass>
-                <glowRadius>12</glowRadius>
-                <glowColor>(0,217,0,0)</glowColor>
-            </li>
-        </comps>
-        <designationCategory>None</designationCategory>
-        <rotatable>false</rotatable>
-        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
-    </ThingDef>
-
-    <ThingDef ParentName="BuildingBase">
-        <defName>StandingLamp_Blue</defName>
-        <label>standing lamp (blue)</label>
-        <thingClass>Building</thingClass>
-        <category>Building</category>
-        <graphicData>
-            <texPath>Things/Building/Furniture/LampStanding</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-            <shadowInfo>
-                <basewidth>0.3</basewidth>
-                <baseHeight>0.3</baseHeight>
-                <tallness>0.6</tallness>
-                <offset>(0,0,-0.1)</offset>
-            </shadowInfo>
-        </graphicData>
-        <altitudeLayer>Waist</altitudeLayer>
-        <passability>PassThroughOnly</passability>
-        <statBases>
-            <MaxHitPoints>50</MaxHitPoints>
-            <WorkToMake>130</WorkToMake>
-            <Flammability>1.0</Flammability>
-        </statBases>
-        <selectable>true</selectable>
-        <description>Standing lamp that lights an area in blue.</description>
-        <costList>
-            <Steel>15</Steel>
-        </costList>
-        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
-        <comps>
-            <li>
-                <compClass>CompPowerTrader</compClass>
-                <basePowerConsumption>150</basePowerConsumption>
-                <shortCircuitInRain>false</shortCircuitInRain>
-                <soundPowerOn>PowerOnSmall</soundPowerOn>
-                <soundPowerOff>PowerOffSmall</soundPowerOff>
-            </li>
-            <li>
-                <compClass>CompGlower</compClass>
-                <glowRadius>12</glowRadius>
-                <glowColor>(0,0,217,0)</glowColor>
-            </li>
-        </comps>
-        <designationCategory>None</designationCategory>
-        <rotatable>false</rotatable>
-        <researchPrerequisite>CommunityCoreLibraryResearchLocker</researchPrerequisite>
-    </ThingDef>
-
-</Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Defs/ThingDefs/CCL_Init.xml b/_Mod/User Release/Community Core Library/Defs/ThingDefs/CCL_Init.xml
index 6d1d04f..28f7587 100644
--- a/_Mod/User Release/Community Core Library/Defs/ThingDefs/CCL_Init.xml	
+++ b/_Mod/User Release/Community Core Library/Defs/ThingDefs/CCL_Init.xml	
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-	<ThingDef>
-		<defName>CCLInit</defName>
-		<category>Building</category>
-		<menuHidden>true</menuHidden>
-		<label>CCLInitializer</label>
-		<thingClass>Thing</thingClass>
-		<inspectorTabs>
-			<li>CommunityCoreLibrary.ModInit</li>
-		</inspectorTabs>
-	</ThingDef>
+    <ThingDef>
+        <defName>CCLInit</defName>
+        <category>Building</category>
+        <menuHidden>true</menuHidden>
+        <label>CCLInitializer</label>
+        <thingClass>Thing</thingClass>
+        <inspectorTabs>
+            <li>CommunityCoreLibrary.ModInit</li>
+        </inspectorTabs>
+    </ThingDef>
 
 </Defs>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Defs/ThingDefs/Buildings_Power.xml b/_Mod/User Release/Community Core Library/Defs/ThingDefs/Geothermal_Override.xml
similarity index 100%
rename from _Mod/User Release/Community Core Library/Defs/ThingDefs/Buildings_Power.xml
rename to _Mod/User Release/Community Core Library/Defs/ThingDefs/Geothermal_Override.xml
diff --git a/_Mod/User Release/Community Core Library/Languages/English/Keyed/PlaceWorkers.xml b/_Mod/User Release/Community Core Library/Languages/English/Keyed/PlaceWorkers.xml
index 5148d97..99d276e 100644
--- a/_Mod/User Release/Community Core Library/Languages/English/Keyed/PlaceWorkers.xml	
+++ b/_Mod/User Release/Community Core Library/Languages/English/Keyed/PlaceWorkers.xml	
@@ -5,10 +5,10 @@
     <MessagePlacementItemSurface>Must be placed on an item surface!</MessagePlacementItemSurface>
     <MessagePlacementMustBeUnderRoof>Must be placed under a roof!</MessagePlacementMustBeUnderRoof>
     <MessagePlacementAgainstSupport>Must place against a supporting structure!</MessagePlacementAgainstSupport>
-    <MessagePlacementCountRestricted>Can not have more than: </MessagePlacementCountRestricted>
-    <MessagePlacementNotOn>You can not place that on </MessagePlacementNotOn>
-    <MessagePlacementNotHere>You can not place that here!</MessagePlacementNotHere>
+    <MessagePlacementCountRestricted>Cannot have more than: </MessagePlacementCountRestricted>
+    <MessagePlacementNotOn>You cannot place that on </MessagePlacementNotOn>
+    <MessagePlacementNotHere>You cannot place that here!</MessagePlacementNotHere>
     <AlertPlaceWorkerRestrictionSupportRemovedLabel>A support was removed!</AlertPlaceWorkerRestrictionSupportRemovedLabel>
-    <AlertPlaceWorkerRestrictionSupportRemovedDesc>Something has been destroyed because it's support has been removed or destroyed!\n\nThe following things have been destroyed because their supports are missing:</AlertPlaceWorkerRestrictionSupportRemovedDesc>
+    <AlertPlaceWorkerRestrictionSupportRemovedDesc>Something has been destroyed because its support has been removed or destroyed!\n\nThe following things have been destroyed because their supports are missing:</AlertPlaceWorkerRestrictionSupportRemovedDesc>
     
 </LanguageData>
\ No newline at end of file
diff --git a/_Mod/User Release/Community Core Library/Languages/English/Keyed/UI_Elements.xml b/_Mod/User Release/Community Core Library/Languages/English/Keyed/UI_Elements.xml
index 49b241f..bfd332c 100644
--- a/_Mod/User Release/Community Core Library/Languages/English/Keyed/UI_Elements.xml	
+++ b/_Mod/User Release/Community Core Library/Languages/English/Keyed/UI_Elements.xml	
@@ -8,23 +8,23 @@
   <CommandChangeColorLabel>Change color</CommandChangeColorLabel>
   <CommandChangeColorDesc>LClick - {0};\nRClick - {1}</CommandChangeColorDesc>
 
-  <CommandChangeRoommateColorLabel>Syncronize colorable lights in room</CommandChangeRoommateColorLabel>
+  <CommandChangeRoommateColorLabel>Synchronize colorable lights in room</CommandChangeRoommateColorLabel>
   <CommandChangeRoommateColorLClick>LClick - Only {0}</CommandChangeRoommateColorLClick>
   <CommandChangeRoommateColorRClick>RClick - All lights</CommandChangeRoommateColorRClick>
 
-  <CommandChangeTouchingPlantLabel>Syncronize all touching plant growers</CommandChangeTouchingPlantLabel>
-  <CommandChangeRoommatePlantLabel>Syncronize plant growers in room</CommandChangeRoommatePlantLabel>
+  <CommandChangeTouchingPlantLabel>Synchronize all touching plant growers</CommandChangeTouchingPlantLabel>
+  <CommandChangeRoommatePlantLabel>Synchronize plant growers in room</CommandChangeRoommatePlantLabel>
   <CommandChangeRoommatePlantLClick>LClick - Only {0}</CommandChangeRoommatePlantLClick>
   <CommandChangeRoommatePlantRClick>RClick - All growers</CommandChangeRoommatePlantRClick>
 
   <CommandGroupOfThingsLClick>LClick - In room</CommandGroupOfThingsLClick>
   <CommandGroupOfThingsRClick>RClick - On map</CommandGroupOfThingsRClick>
 
-  <CommandGroupOfThingsByDefLabel>Syncronize all touching {0}</CommandGroupOfThingsByDefLabel>
-  <CommandGroupOfThingsByLinkerLabel>Syncronize all linked {0}</CommandGroupOfThingsByLinkerLabel>
+  <CommandGroupOfThingsByDefLabel>Synchronize all touching {0}</CommandGroupOfThingsByDefLabel>
+  <CommandGroupOfThingsByLinkerLabel>Synchronize all linked {0}</CommandGroupOfThingsByLinkerLabel>
 
-  <CommandGroupOfThingsByDefInRoomLabel>Syncronize all {0} in room</CommandGroupOfThingsByDefInRoomLabel>
-  <CommandGroupOfThingsByLinkerInRoomLabel>Syncronize all linked {0} in room</CommandGroupOfThingsByLinkerInRoomLabel>
+  <CommandGroupOfThingsByDefInRoomLabel>Synchronize all {0} in room</CommandGroupOfThingsByDefInRoomLabel>
+  <CommandGroupOfThingsByLinkerInRoomLabel>Synchronize all linked {0} in room</CommandGroupOfThingsByLinkerInRoomLabel>
 
   <HelpOTabTitle>Mod Help</HelpOTabTitle>
   <NoHelpDefs>No help defs found</NoHelpDefs>
diff --git a/suggestions.csv b/suggestions.csv
index 21191d7..ac5306b 100644
--- a/suggestions.csv
+++ b/suggestions.csv
@@ -11,7 +11,7 @@
 "Copy bills between work tables",,"mrofa","via pm"
 "Restrict to neighbouring building",,"mrofa","via pm"
 "Event logger",,"mrofa","via pm"
-"A “lite” version of the mod with minimal vanilla edits","CCL_Lite_vX.Y.Z.zip","mrofa","via pm"
+"A “lite” version of the mod with minimal vanilla edits","Vanilla Tweaks","mrofa","via pm"
 "Restrict proximity, in row/column",,"skyarkhangel","via pm"
 "Designator rclick for different building types",,"jacob814","via pm"
 "Unlocking growable plants via research","AdvancedResearchDef.sowTags","skyarkhangel","via pm"