diff --git a/RAM_Adapter/AdapterActions/Pull.cs b/RAM_Adapter/AdapterActions/Pull.cs
index d8a74f7..a0f18c7 100644
--- a/RAM_Adapter/AdapterActions/Pull.cs
+++ b/RAM_Adapter/AdapterActions/Pull.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -66,3 +66,4 @@ public override IEnumerable<object> Pull(IRequest request, PullType pullType = P
 
 
 
+
diff --git a/RAM_Adapter/AdapterActions/Push.cs b/RAM_Adapter/AdapterActions/Push.cs
index d2122f4..dd16595 100644
--- a/RAM_Adapter/AdapterActions/Push.cs
+++ b/RAM_Adapter/AdapterActions/Push.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -39,22 +39,9 @@ public partial class RAMAdapter
 
         public override List<object> Push(IEnumerable<object> objects, string tag = "", PushType pushType = PushType.AdapterDefault, ActionConfig actionConfig = null)
         {
-            // ----------------------------------------//
-            //                 SET-UP                  //
-            // ----------------------------------------//
-
-            // If unset, set the pushType to AdapterSettings' value (base AdapterSettings default is FullCRUD).
-            if (pushType == PushType.AdapterDefault)
-                pushType = m_AdapterSettings.DefaultPushType;            
-            
-            //Filter out levels for others
-            IEnumerable<object> levels = objects.Where(x => x is Level);
-            IEnumerable<object> notLevels = objects.Where(x => !(x is Level));
-
-            //Add the levels to a new list. This is to ensure that they are first and thereby pushed before the other objects
-            List<object> sortedObjects = new List<object>();
-            sortedObjects.AddRange(levels);
-            sortedObjects.AddRange(notLevels);
+            //Push levels before all other objects.
+            List<object> sortedObjects = objects.Where(x => x is Level).ToList();
+            sortedObjects.AddRange(objects.Where(x => !(x is Level)));
 
             List<object> result = new List<object>();
 
@@ -65,14 +52,12 @@ public override List<object> Push(IEnumerable<object> objects, string tag = "",
                 {
                     result = base.Push(sortedObjects, tag, pushType, actionConfig);
                 }
-                catch
+                finally
                 {
-                    Engine.Base.Compute.RecordError("Could not complete Push.");
-                }                
+                    CloseDatabase();
+                }
             }
 
-            CloseDatabase();
-
             return result;
         }
 
@@ -82,3 +67,4 @@ public override List<object> Push(IEnumerable<object> objects, string tag = "",
 
 
 
+
diff --git a/RAM_Adapter/Convert/ToBHoM.cs b/RAM_Adapter/Convert/ToBHoM.cs
index a3991ed..2c6052a 100644
--- a/RAM_Adapter/Convert/ToBHoM.cs
+++ b/RAM_Adapter/Convert/ToBHoM.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -999,3 +999,4 @@ public static oM.Geometry.Point PointFromRAM(this SCoordinate sc, double zOffset
 
 
 
+
diff --git a/RAM_Adapter/Convert/ToRAM.cs b/RAM_Adapter/Convert/ToRAM.cs
index eaee326..ac48830 100644
--- a/RAM_Adapter/Convert/ToRAM.cs
+++ b/RAM_Adapter/Convert/ToRAM.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -186,3 +186,4 @@ public static IStory GetStory(this Panel panel, IStories ramStories)
 
 
 
+
diff --git a/RAM_Adapter/Create/Bar.cs b/RAM_Adapter/Create/Bar.cs
index f20de6f..3fea39a 100644
--- a/RAM_Adapter/Create/Bar.cs
+++ b/RAM_Adapter/Create/Bar.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -231,3 +231,4 @@ private bool CreateCollection(IEnumerable<Bar> bhomBars)
     }
 }
 
+
diff --git a/RAM_Adapter/Create/ContourLoadSet.cs b/RAM_Adapter/Create/ContourLoadSet.cs
index 2c73160..d043958 100644
--- a/RAM_Adapter/Create/ContourLoadSet.cs
+++ b/RAM_Adapter/Create/ContourLoadSet.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -110,3 +110,4 @@ private bool CreateCollection(IEnumerable<ContourLoadSet> loads)
     }
 }
 
+
diff --git a/RAM_Adapter/Create/Errors.cs b/RAM_Adapter/Create/Errors.cs
index 09caf00..8358e62 100644
--- a/RAM_Adapter/Create/Errors.cs
+++ b/RAM_Adapter/Create/Errors.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -83,3 +83,4 @@ private void CreatePropertyEvent(string failedProperty, string elemType, string
     }
 }
 
+
diff --git a/RAM_Adapter/Create/Grid.cs b/RAM_Adapter/Create/Grid.cs
index 909fc5e..972c12a 100644
--- a/RAM_Adapter/Create/Grid.cs
+++ b/RAM_Adapter/Create/Grid.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -219,3 +219,4 @@ private bool CreateCollection(IEnumerable<Grid> bhomGrid)
     }
 }
 
+
diff --git a/RAM_Adapter/Create/Level.cs b/RAM_Adapter/Create/Level.cs
index 971008b..1ea133b 100644
--- a/RAM_Adapter/Create/Level.cs
+++ b/RAM_Adapter/Create/Level.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -53,120 +53,179 @@ public partial class RAMAdapter
         /**** Private methods                           ****/
         /***************************************************/
 
+        //private bool CreateCollection(IEnumerable<Level> bhomLevels)
+        //{
+        //    if (bhomLevels.Count() != 0)
+        //    {
+        //        //sort levels by elevation
+        //        IOrderedEnumerable<Level> orderedBhomLevels = bhomLevels.OrderBy(o => o.Elevation);
+        //        List<Level> sortedBhomLevels = new List<Level>();
+
+        //        //Check levels for negatives
+        //        if (orderedBhomLevels.First().Elevation < 0)
+        //        {
+        //            throw new Exception("Base level can not be negative for RAM. Please move model origin point to set all geometry and levels at 0 or greater.");
+        //        }
+
+        //        //Check levels for base level = 0, remove if occurs
+        //        if (orderedBhomLevels.First().Elevation == 0)
+        //        {
+        //            sortedBhomLevels = orderedBhomLevels.Where(level => level.Elevation != 0).ToList();
+        //        }
+        //        else
+        //        {
+        //            sortedBhomLevels = orderedBhomLevels.Where(level => level.Elevation != 0).ToList();
+        //        }
+
+        //        // Register Floor types
+        //        IFloorTypes ramFloorTypes;
+        //        IFloorType ramFloorType = null;
+        //        IStories ramStories;
+
+        //        //Create floor type at each level
+        //        for (int i = 0; i < sortedBhomLevels.Count(); i++)
+        //        {
+        //            Level level = sortedBhomLevels.ElementAt(i);
+        //            double levelHtDbl = level.Elevation.ToInch();
+        //            double levelHt = Math.Round(levelHtDbl, 3);
+
+        //            // Get elevations and skip if level elevation already in RAM
+        //            ramStories = m_Model.GetStories();
+        //            List<double> ramElevs = new List<double>();
+        //            List<string> ramStoryNames = new List<string>();
+        //            for (int j = 0; j < ramStories.GetCount(); j++)
+        //            {
+        //                ramElevs.Add(ramStories.GetAt(j).dElevation);
+        //                ramStoryNames.Add(ramStories.GetAt(j).strLabel);
+        //            }
+
+        //            if (ramElevs.Contains(levelHt) != true && ramStoryNames.Contains(level.Name) != true)
+        //            {
+        //                double height;
+        //                // Ground floor ht = 0 for RAM
+        //                if (i == 0)
+        //                {
+        //                    height = levelHt;
+        //                }
+        //                else
+        //                {
+        //                    Level lastLevel = sortedBhomLevels.ElementAt(i - 1);
+        //                    height = levelHt - lastLevel.Elevation.ToInch();
+        //                }
+
+        //                int newIndex;
+        //                if (ramElevs.FindIndex(x => x > levelHt) == -1)
+        //                {
+        //                    newIndex = ramElevs.Count();
+        //                }
+        //                else
+        //                {
+        //                    newIndex = ramElevs.FindIndex(x => x > levelHt);
+        //                }
+
+        //                List<string> ramFloorTypeNames = new List<string>();
+        //                ramFloorTypes = m_Model.GetFloorTypes();
+        //                Boolean floorTypeExists = false;
+        //                for (int j = 0; j < ramFloorTypes.GetCount(); j++)
+        //                {
+        //                    IFloorType testFloorType = ramFloorTypes.GetAt(j);
+        //                    if (testFloorType.strLabel == level.Name)
+        //                    {
+        //                        ramFloorType = testFloorType;
+        //                        floorTypeExists = true;
+        //                    }
+        //                }
+
+        //                if (floorTypeExists == false)
+        //                {
+        //                    ramFloorType = ramFloorTypes.Add(level.Name);
+        //                }
+
+        //                // Modify story above if not top floor
+        //                if (newIndex < ramStories.GetCount())
+        //                {
+        //                    IStory ramStoryAbove = ramStories.GetAt(newIndex);
+        //                    ramStoryAbove.dFlrHeight = ramStoryAbove.dElevation - levelHt;
+        //                }
+        //                if (newIndex > 0 && ramStories.GetCount() > 0)
+        //                {
+        //                    IStory ramStoryBelow = ramStories.GetAt(newIndex - 1);
+        //                    height = levelHt - ramStoryBelow.dElevation;
+        //                }
+
+        //                // Insert story at index
+        //                ramStories.InsertAt(newIndex, ramFloorType.lUID, level.Name, height);
+        //            }
+        //        }
+
+        //        //Save file
+        //        m_IDBIO.SaveDatabase();
+
+        //    }
+        //    return true;
+
+        //}
+
+        /***************************************************/
         private bool CreateCollection(IEnumerable<Level> bhomLevels)
         {
-            if (bhomLevels.Count() != 0)
+            bool insert = false; //expose as an option some day. If insert is true, floor to floor heights are maintained. If false, elevations are maintained.
+
+            // Register Floor types
+            IFloorTypes ramFloorTypes = m_Model.GetFloorTypes();
+            RAMId id = new RAMId();
+
+            foreach (Level bhLevel in bhomLevels)
             {
-                //sort levels by elevation
-                IOrderedEnumerable<Level> orderedBhomLevels = bhomLevels.OrderBy(o => o.Elevation);
-                List<Level> sortedBhomLevels = new List<Level>();
+                //Add the floortype to RAM before adding the level.
+                IFloorType ramFloorType = ramFloorTypes.Add(bhLevel.Name);
 
-                //Check levels for negatives
-                if (orderedBhomLevels.First().Elevation < 0)
+                if (bhLevel.Elevation <= 0)
                 {
-                    throw new Exception("Base level can not be negative for RAM. Please move model origin point to set all geometry and levels at 0 or greater.");
+                    BH.Engine.Base.Compute.RecordWarning($"Level {bhLevel.Name} has an elevation at or below 0. This level has been skipped.");
+                    bhLevel.SetAdapterId(new RAMId());
+                    continue;
                 }
 
-                //Check levels for base level = 0, remove if occurs
-                if (orderedBhomLevels.First().Elevation == 0)
+                //Get the current list of stories
+                List<Double> elevations = new List<double>() { };
+                IStories ramStories = m_Model.GetStories();
+                for (int i = 0; i < ramStories.GetCount(); i++)
                 {
-                    sortedBhomLevels = orderedBhomLevels.Where(level => level.Elevation != 0).ToList();
-                }
-                else
-                {
-                    sortedBhomLevels = orderedBhomLevels.Where(level => level.Elevation != 0).ToList();
+                    elevations.Add(ramStories.GetAt(i).dElevation);
                 }
 
-                // Register Floor types
-                IFloorTypes ramFloorTypes;
-                IFloorType ramFloorType = null;
-                IStories ramStories;
+                //Find the level below the new level
+                double bhElevation = bhLevel.Elevation.ToInch();
+                int levelIndexBelow = elevations.Where(x => x < bhElevation).Count() - 1;
+                double elevationBelow = (levelIndexBelow >= 0) ? elevations[levelIndexBelow] : 0;
 
-                //Create floor type at each level
-                for (int i = 0; i < sortedBhomLevels.Count(); i++)
-                {
-                    Level level = sortedBhomLevels.ElementAt(i);
-                    double levelHtDbl = level.Elevation.ToInch();
-                    double levelHt = Math.Round(levelHtDbl, 3);
-
-                    // Get elevations and skip if level elevation already in RAM
-                    ramStories = m_Model.GetStories();
-                    List<double> ramElevs = new List<double>();
-                    List<string> ramStoryNames = new List<string>();
-                    for (int j = 0; j < ramStories.GetCount(); j++)
-                    {
-                        ramElevs.Add(ramStories.GetAt(j).dElevation);
-                        ramStoryNames.Add(ramStories.GetAt(j).strLabel);
-                    }
+                //Add the new level. Height of the level is its elevation minus the elevation of the level below.
+                IStory ramStory = ramStories.Add(ramFloorType.lUID, bhLevel.Name, bhElevation - elevationBelow);
 
-                    if (ramElevs.Contains(levelHt) != true && ramStoryNames.Contains(level.Name) != true)
+                if (!insert)
+                {
+                    //If there is a level above, modify it
+                    if (ramStories.GetCount() > levelIndexBelow + 2)
                     {
-                        double height;
-                        // Ground floor ht = 0 for RAM
-                        if (i == 0)
-                        {
-                            height = levelHt;
-                        }
-                        else
-                        {
-                            Level lastLevel = sortedBhomLevels.ElementAt(i - 1);
-                            height = levelHt - lastLevel.Elevation.ToInch();
-                        }
-
-                        int newIndex;
-                        if (ramElevs.FindIndex(x => x > levelHt) == -1)
-                        {
-                            newIndex = ramElevs.Count();
-                        }
-                        else
-                        {
-                            newIndex = ramElevs.FindIndex(x => x > levelHt);
-                        }
-
-                        List<string> ramFloorTypeNames = new List<string>();
-                        ramFloorTypes = m_Model.GetFloorTypes();
-                        Boolean floorTypeExists = false;
-                        for (int j = 0; j < ramFloorTypes.GetCount(); j++)
-                        {
-                            IFloorType testFloorType = ramFloorTypes.GetAt(j);
-                            if (testFloorType.strLabel == level.Name)
-                            {
-                                ramFloorType = testFloorType;
-                                floorTypeExists = true;
-                            }
-                        }
-
-                        if (floorTypeExists == false)
-                        {
-                            ramFloorType = ramFloorTypes.Add(level.Name);
-                        }
-
-                        // Modify story above if not top floor
-                        if (newIndex < ramStories.GetCount())
-                        {
-                            IStory ramStoryAbove = ramStories.GetAt(newIndex);
-                            ramStoryAbove.dFlrHeight = ramStoryAbove.dElevation - levelHt;
-                        }
-                        if (newIndex > 0 && ramStories.GetCount() > 0)
-                        {
-                            IStory ramStoryBelow = ramStories.GetAt(newIndex - 1);
-                            height = levelHt - ramStoryBelow.dElevation;
-                        }
-
-                        // Insert story at index
-                        ramStories.InsertAt(newIndex, ramFloorType.lUID, level.Name, height);
+                        IStory levelAbove = ramStories.GetAt(levelIndexBelow + 2);
+                        levelAbove.dFlrHeight = levelAbove.dFlrHeight - ramStory.dFlrHeight;
                     }
                 }
 
-                //Save file
-                m_IDBIO.SaveDatabase();
-
+                id.Id = ramStory.lUID;
+                bhLevel.SetAdapterId(id);
             }
-            return true;
 
+            //Save file
+            m_IDBIO.SaveDatabase();
+
+            return true;
         }
 
         /***************************************************/
+
     }
 }
 
+
diff --git a/RAM_Adapter/Create/MaterialFragment.cs b/RAM_Adapter/Create/MaterialFragment.cs
index e88ca27..9381368 100644
--- a/RAM_Adapter/Create/MaterialFragment.cs
+++ b/RAM_Adapter/Create/MaterialFragment.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -59,6 +59,13 @@ private bool CreateCollection(IEnumerable<IMaterialFragment> materials)
 
             //Not yet implemented
 
+            foreach (IMaterialFragment bhMat in materials)
+            {
+                RAMId id = new RAMId();
+
+                bhMat.SetAdapterId(id);
+            }
+
             return true;
         }
 
@@ -66,3 +73,4 @@ private bool CreateCollection(IEnumerable<IMaterialFragment> materials)
     }
 }
 
+
diff --git a/RAM_Adapter/Create/Panel.cs b/RAM_Adapter/Create/Panel.cs
index bd76d7c..c5d05bb 100644
--- a/RAM_Adapter/Create/Panel.cs
+++ b/RAM_Adapter/Create/Panel.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -57,163 +57,145 @@ private bool CreateCollection(IEnumerable<Panel> bhomPanels)
         {
             //Code for creating a collection of floors and walls in the software
 
-            List<Panel> panels = bhomPanels.ToList();
+            // Split walls and floors and get all elevations
+            IEnumerable<Panel> floors = bhomPanels.Where(x => Math.Abs(x.Normal().Z) >= 0.707);
+            IEnumerable<Panel> walls = bhomPanels.Where(x => Math.Abs(x.Normal().Z) < 0.707);
 
-            // Register Floor types
-            IFloorType ramFloorType;
-            IStories ramStories;
-            IStory ramStory;
+            IStories ramStories = m_Model.GetStories();
 
-            //Create wall and floor lists with individual heights
-            List<Panel> wallPanels = new List<Panel>();
-            List<Panel> floors = new List<Panel>();
-            List<double> panelHeights = new List<double>();
-            List<Point> panelPoints = new List<Point>();
+            #region Create Floors
 
-            // Split walls and floors and get all elevations
-            foreach (Panel panel in panels)
+            for (int i = 0; i < ramStories.GetCount(); i++)
             {
-                double panelNormZ = panel.Normal().Z;
+                IStory ramStory = ramStories.GetAt(i);
+                IFloorType ramFloorType = ramStory.GetFloorType();
 
-                //Split walls and floors
-                if (Math.Abs(panelNormZ) < 0.707) // check normal against 45 degree slope
-                {
-                    wallPanels.Add(panel);
-                }
-                else
+                IEnumerable<Panel> storyFloors = floors.Where(x => x.GetStory(ramStories).lUID == ramStory.lUID);
+
+                ramStory.Equals(ramStory);
+
+                //RAM can't handle adjoining slab edges, so we merge them.
+                List<Polyline> outlineCurves = storyFloors.Select(x => x.OutlineCurve().ToPolyline()).ToList();
+                List<List<Polyline>> outlineCurvesDistributed = outlineCurves.BooleanUnion().DistributeOutlines();
+
+                List<Polyline> outlines = outlineCurvesDistributed.Select(x => x.First()).ToList();
+
+                //Flip all outlines so that they are clockwise.
+                outlines = outlines.Select(pl => pl.IsClockwise(Vector.ZAxis) ? pl : pl.Flip()).ToList();
+
+                //Write slab edges to RAM
+                ISlabEdges ramSlabEdges = ramFloorType.GetAllSlabEdges();
+                foreach (Line edge in outlines.SelectMany(x => x.SubParts()))
                 {
-                    floors.Add(panel);
+                    SCoordinate startPt = edge.IStartPoint().ToRAM();
+                    SCoordinate endPt = edge.IEndPoint().ToRAM();
+                    ramSlabEdges.Add(startPt.dXLoc, startPt.dYLoc, endPt.dXLoc, endPt.dYLoc, 0);
                 }
-            }
 
-            ramStories = m_Model.GetStories();
+                //Add the openings
+                IEnumerable<Opening> panelOpenings = storyFloors.SelectMany(x => x.Openings);
+                List<Polyline> openingOutlines = panelOpenings.Select(x => x.OutlineCurve().ToPolyline()).ToList();
 
-            #region Create Floors
+                //Add the new openings resulting from the external edges boolean.
+                openingOutlines.AddRange(outlineCurvesDistributed.SelectMany(x => x.Skip(1)).ToList());
 
-            // Cycle through floors and create on story
-            foreach (Panel panel in floors)
-            {
-                RAMId RAMId = new RAMId();
-                string name = panel.Name;
-                PolyCurve outlineExternal = panel.OutlineCurve();
-                ramStory = panel.GetStory(ramStories);
-                ramFloorType = ramStory.GetFloorType();
+                //Boolean all openings, discard any resulting internal openings.
+                openingOutlines = openingOutlines.BooleanUnion().DistributeOutlines().Select(x => x.First()).ToList();
 
-                try
+                //Flip all outlines so that they are clockwise.
+                openingOutlines = openingOutlines.Select(pl => pl.IsClockwise(Vector.ZAxis) ? pl : pl.Flip()).ToList();
+
+                ISlabEdges ramOpeningEdges = ramFloorType.GetAllSlabOpenings();
+                foreach (Line edge in openingOutlines.SelectMany(x => x.SubParts()))
                 {
-                    // Set slab edges on FloorType in RAM for external edges
-                    ISlabEdges ramSlabEdges = ramFloorType.GetAllSlabEdges();
-                    ISlabEdges ramOpeningEdges = ramFloorType.GetAllSlabOpenings();
+                    SCoordinate startPt = edge.IStartPoint().ToRAM();
+                    SCoordinate endPt = edge.IEndPoint().ToRAM();
+                    ramOpeningEdges.Add(startPt.dXLoc, startPt.dYLoc, endPt.dXLoc, endPt.dYLoc, 0);
+                }
 
-                    // Get external and internal edges of floor panel
-                    List<PolyCurve> panelOutlines = new List<PolyCurve>();
-                    List<PolyCurve> openingOutlines = new List<PolyCurve>();
+                // Create all the deck assignments (these can be adjoining)
+                foreach (Panel bhFloorPanel in storyFloors)
+                {
+                    string name = bhFloorPanel.Name;
 
-                    Vector zDown = BH.Engine.Geometry.Create.Vector(0, 0, -1);
+                    PolyCurve outlineExternal = bhFloorPanel.OutlineCurve();
 
                     // RAM requires edges clockwise, flip if counterclockwise
-                    PolyCurve cwOutline = (outlineExternal.IsClockwise(zDown) == false) ? outlineExternal.Flip() : outlineExternal;
+                    outlineExternal = outlineExternal.IsClockwise(Vector.ZAxis) ? outlineExternal : outlineExternal.Flip();
+
+                    List<ICurve> edgeCrvs = outlineExternal.Curves;
 
-                    List<ICurve> edgeCrvs = cwOutline.Curves;
+                    List<Point> ctrlPoints = outlineExternal.ControlPoints();
 
-                    foreach (ICurve crv in edgeCrvs)
+                    if (!ctrlPoints.First().IsEqual(ctrlPoints.Last()))
                     {
-                        Point startPt = crv.IStartPoint();
-                        Point endPt = crv.IEndPoint();
-                        ramSlabEdges.Add(startPt.X.ToInch(), startPt.Y.ToInch(), endPt.X.ToInch(), endPt.Y.ToInch(), 0);
+                        ctrlPoints.Add(ctrlPoints.Last().DeepClone());
                     }
 
-                    List<Opening> panelOpenings = panel.Openings;
+                    ISurfaceProperty srfProp = bhFloorPanel.Property;
+                    int deckProplUID = GetAdapterId<int>(srfProp);
 
-                    foreach (Opening opening in panelOpenings)
+                    if (deckProplUID != 0)
                     {
-                        PolyCurve outlineOpening = opening.OutlineCurve();
-                        openingOutlines.Add(outlineOpening);
-                    }
 
-                    foreach (PolyCurve outline in openingOutlines)
-                    {
-                        // RAM requires edges clockwise, flip if counterclockwise
-                        PolyCurve cwOpenOutline = (outline.IsClockwise(zDown) == false) ? outline.Flip() : outline;
+                        //Add decks, then set deck points per outline
+                        IDecks ramDecks = ramFloorType.GetDecks();
+                        IDeck ramDeck = ramDecks.Add(deckProplUID, ctrlPoints.Count);
 
-                        if (!(outlineExternal.IsContaining(cwOpenOutline, false)))
-                        {
-                            cwOpenOutline = outlineExternal.BooleanIntersection(cwOpenOutline)[0];
-                            Engine.Base.Compute.RecordWarning("Panel " + name + " opening intersects floor boundary. Boolean intersection was used to get opening extents on panel, confirm opening extents in RAM.");
-                        }
+                        IPoints ramPoints = ramDeck.GetPoints();
 
-                        List<ICurve> openEdgeCrvs = cwOpenOutline.Curves;
+                        // Create list of SCoordinates for floor outlines
+                        List<SCoordinate> cornersExt = new List<SCoordinate>();
 
-                        foreach (ICurve crv in openEdgeCrvs)
+                        foreach (Point point in ctrlPoints)
                         {
-                            Point startPt = crv.IStartPoint();
-                            Point endPt = crv.IEndPoint();
-                            ramOpeningEdges.Add(startPt.X.ToInch(), startPt.Y.ToInch(), endPt.X.ToInch(), endPt.Y.ToInch(), 0);
+                            SCoordinate cornerExt = point.ToRAM();
+                            cornersExt.Add(cornerExt);
                         }
-                    }
-
-                    // Create Deck 
-                    List<Point> ctrlPoints = cwOutline.ControlPoints();
-
-                    if (ctrlPoints.First() != ctrlPoints.Last())
-                    {
-                        ctrlPoints.Add(ctrlPoints.Last().DeepClone());
-                    }
-
-                    ISurfaceProperty srfProp = panel.Property;
-                    int deckProplUID = GetAdapterId<int>(srfProp);
 
-                    //Add decks, then set deck points per outline
-                    IDecks ramDecks = ramFloorType.GetDecks();
-                    IDeck ramDeck = ramDecks.Add(deckProplUID, ctrlPoints.Count);
+                        for (int k = 0; k < cornersExt.Count; k++)
+                        {
+                            ramPoints.Delete(k);
+                            ramPoints.InsertAt(k, cornersExt[k]);
+                        }
 
-                    IPoints ramPoints = ramDeck.GetPoints();
+                        ramDeck.SetPoints(ramPoints);
 
-                    // Create list of SCoordinates for floor outlines
-                    List<SCoordinate> cornersExt = new List<SCoordinate>();
+                        // Add warning to report floors flattened to level as required for RAM
+                        if (Math.Abs(bhFloorPanel.Normal().Z) < 1)
+                        { Engine.Base.Compute.RecordWarning("Panel " + name + " snapped to level " + ramStory.strLabel + "."); }
 
-                    foreach (Point point in ctrlPoints)
-                    {
-                        SCoordinate cornerExt = point.ToRAM();
-                        cornersExt.Add(cornerExt);
+                        // Add an adapter ID to the incoming panel.
+                        RAMId id = new RAMId() { Id = ramDeck.lUID };
+                        bhFloorPanel.SetAdapterId(id);
                     }
-
-                    for (int k = 0; k < cornersExt.Count; k++)
+                    else
                     {
-                        ramPoints.Delete(k);
-                        ramPoints.InsertAt(k, cornersExt[k]);
+                        bhFloorPanel.SetAdapterId(new RAMId());
+                        Engine.Base.Compute.RecordError($"Panel {name} has a section property with no AdapterID, so the deck could not be assigned in RAM.");
                     }
-
-                    ramDeck.SetPoints(ramPoints);
-
-                    // Add warning to report floors flattened to level as required for RAM
-                    if (Math.Abs(panel.Normal().Z) < 1)
-                    { Engine.Base.Compute.RecordWarning("Panel " + name + " snapped to level " + ramStory.strLabel + "."); }
-                }
-                catch
-                {
-                    CreateElementError("panel", name);
                 }
             }
             #endregion
 
             #region Create Walls
+
             //Cycle through walls; if wall crosses level place at level
-            foreach (Panel wallPanel in wallPanels)
+            foreach (Panel bhWallPanel in walls)
             {
-                string name = wallPanel.Name;
+                string name = bhWallPanel.Name;
 
                 try
                 {
                     double thickness = 0.2; // default thickness
-                    if (wallPanel.Property is ConstantThickness)
+                    if (bhWallPanel.Property is ConstantThickness)
                     {
-                        ConstantThickness prop = (ConstantThickness)wallPanel.Property;
+                        ConstantThickness prop = (ConstantThickness)bhWallPanel.Property;
                         thickness = prop.Thickness;
                     }
 
                     // Find outline of planar panel
-                    PolyCurve outline = BH.Engine.Spatial.Query.OutlineCurve(wallPanel);
+                    PolyCurve outline = BH.Engine.Spatial.Query.OutlineCurve(bhWallPanel);
                     List<Point> wallPts = outline.DiscontinuityPoints();
                     List<Point> sortedWallPts = wallPts.OrderBy(p => p.X).ToList();
                     Point leftPt = sortedWallPts.First();
@@ -230,11 +212,11 @@ private bool CreateCollection(IEnumerable<Panel> bhomPanels)
 
                     for (int i = 0; i < ramStories.GetCount(); i++)
                     {
-                        ramStory = ramStories.GetAt(i);
+                        IStory ramStory = ramStories.GetAt(i);
                         // If wall crosses level, add wall to ILayoutWalls for that level
                         if (Math.Round(wallMax.Z.ToInch(), 0) >= ramStory.dElevation && Math.Round(wallMin.Z.ToInch(), 0) < ramStory.dElevation)
                         {
-                            ramFloorType = ramStory.GetFloorType();
+                            IFloorType ramFloorType = ramStory.GetFloorType();
 
                             //Get ILayoutWalls of FloorType and add wall
                             ILayoutWalls ramLayoutWalls = ramFloorType.GetLayoutWalls();
@@ -247,7 +229,7 @@ private bool CreateCollection(IEnumerable<Panel> bhomPanels)
                             IWall ramWall = ramWalls.GetAt(0);
 
                             // Find opening location, width, and height from outline and apply                      
-                            foreach (Opening open in wallPanel.Openings)
+                            foreach (Opening open in bhWallPanel.Openings)
                             {
                                 PolyCurve openOutline = open.OutlineCurve();
                                 BoundingBox openBounds = BH.Engine.Geometry.Query.Bounds(openOutline);
@@ -298,11 +280,17 @@ private bool CreateCollection(IEnumerable<Panel> bhomPanels)
                                     }
                                 }
                             }
+
+                            // Add an adapter ID to the incoming panel.
+                            RAMId id = new RAMId() { Id = ramWall.lUID };
+                            bhWallPanel.SetAdapterId(id);
                         }
+
                     }
                 }
                 catch
                 {
+                    bhWallPanel.SetAdapterId(new RAMId());
                     CreateElementError("panel", name);
                 }
             }
@@ -318,3 +306,4 @@ private bool CreateCollection(IEnumerable<Panel> bhomPanels)
     }
 }
 
+
diff --git a/RAM_Adapter/Create/SectionProperty.cs b/RAM_Adapter/Create/SectionProperty.cs
index 8d98653..08b8625 100644
--- a/RAM_Adapter/Create/SectionProperty.cs
+++ b/RAM_Adapter/Create/SectionProperty.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -58,6 +58,13 @@ private bool CreateCollection(IEnumerable<ISectionProperty> sectionProperties)
 
             //Not yet implemented
 
+            foreach (ISectionProperty bhSection in sectionProperties)
+            {
+                RAMId id = new RAMId();
+
+                bhSection.SetAdapterId(id);
+            }
+
             return true;
         }
 
@@ -65,3 +72,4 @@ private bool CreateCollection(IEnumerable<ISectionProperty> sectionProperties)
     }
 }
 
+
diff --git a/RAM_Adapter/Create/SurfaceProperty.cs b/RAM_Adapter/Create/SurfaceProperty.cs
index 7274386..eead5ed 100644
--- a/RAM_Adapter/Create/SurfaceProperty.cs
+++ b/RAM_Adapter/Create/SurfaceProperty.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -118,3 +118,4 @@ private bool CreateCollection(IEnumerable<ISurfaceProperty> srfProps)
     }
 }
 
+
diff --git a/RAM_Adapter/Create/UniformLoadSet.cs b/RAM_Adapter/Create/UniformLoadSet.cs
index b7defe3..0f6faac 100644
--- a/RAM_Adapter/Create/UniformLoadSet.cs
+++ b/RAM_Adapter/Create/UniformLoadSet.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -159,3 +159,4 @@ private bool CreateCollection(IEnumerable<UniformLoadSet> loadSets)
     }
 }
 
+
diff --git a/RAM_Adapter/Create/_Create.cs b/RAM_Adapter/Create/_Create.cs
index 1f177d0..46ef7fd 100644
--- a/RAM_Adapter/Create/_Create.cs
+++ b/RAM_Adapter/Create/_Create.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -75,3 +75,4 @@ protected override bool ICreate<T>(IEnumerable<T> objects, ActionConfig actionCo
 
 
 
+
diff --git a/RAM_Adapter/Delete/_Delete.cs b/RAM_Adapter/Delete/_Delete.cs
index 817e09e..9db881a 100644
--- a/RAM_Adapter/Delete/_Delete.cs
+++ b/RAM_Adapter/Delete/_Delete.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -47,3 +47,4 @@ protected override int IDelete(Type type, IEnumerable<object> ids, ActionConfig
 
 
 
+
diff --git a/RAM_Adapter/Properties/AssemblyInfo.cs b/RAM_Adapter/Properties/AssemblyInfo.cs
index 99965b8..368502e 100644
--- a/RAM_Adapter/Properties/AssemblyInfo.cs
+++ b/RAM_Adapter/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -55,7 +55,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
+[assembly: AssemblyFileVersion("6.1.0.0")]
+
 
 
 
diff --git a/RAM_Adapter/RAMAdapter.cs b/RAM_Adapter/RAMAdapter.cs
index 625160d..36f3937 100644
--- a/RAM_Adapter/RAMAdapter.cs
+++ b/RAM_Adapter/RAMAdapter.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -36,12 +36,6 @@ namespace BH.Adapter.RAM
 {
     public partial class RAMAdapter : BHoMAdapter
     {
-
-        /***************************************************/
-        /**** Public Properties                         ****/
-        /***************************************************/
-
-        public const string ID = "RAM_id";
         
         /***************************************************/
         /**** Constructors                              ****/
@@ -50,8 +44,6 @@ public partial class RAMAdapter : BHoMAdapter
         //Add any applicable constructors here, such as linking to a specific file or anything else as well as linking to that file through the (if existing) com link via the API
         public RAMAdapter(string filePath = "", bool active = false)
         {
-            m_AdapterSettings.UseAdapterId = false;
-
             if (active)
             {
                 AdapterIdFragmentType = typeof(RAMId);   //Set the AdapterIdType to RAMId to get RAM Fragment Data
@@ -60,6 +52,8 @@ public RAMAdapter(string filePath = "", bool active = false)
                 SetupDependencies();
                 SetupComparers();
 
+                m_AdapterSettings.CacheCRUDobjects = false;
+
                 m_Application = null;
                 m_Application = new RamDataAccess1();
                 m_IDBIO = null;
@@ -209,3 +203,4 @@ private bool ClearTempFiles(string filePath)
 
 
 
+
diff --git a/RAM_Adapter/Read/Bar.cs b/RAM_Adapter/Read/Bar.cs
index 657f982..f015a94 100644
--- a/RAM_Adapter/Read/Bar.cs
+++ b/RAM_Adapter/Read/Bar.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -184,3 +184,4 @@ private List<IBeam> ReadRamBeams(IModel ramModel)
 
 
 
+
diff --git a/RAM_Adapter/Read/ContourLoadSet.cs b/RAM_Adapter/Read/ContourLoadSet.cs
index 1ab328d..999fd1a 100644
--- a/RAM_Adapter/Read/ContourLoadSet.cs
+++ b/RAM_Adapter/Read/ContourLoadSet.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -90,3 +90,4 @@ private List<ContourLoadSet> ReadContourLoadSets(List<string> ids = null)
 
 
 
+
diff --git a/RAM_Adapter/Read/Errors.cs b/RAM_Adapter/Read/Errors.cs
index 2b4eec0..af719fe 100644
--- a/RAM_Adapter/Read/Errors.cs
+++ b/RAM_Adapter/Read/Errors.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -61,3 +61,4 @@ public partial class RAMAdapter
 
 
 
+
diff --git a/RAM_Adapter/Read/Grid.cs b/RAM_Adapter/Read/Grid.cs
index 043a59f..f3a15b7 100644
--- a/RAM_Adapter/Read/Grid.cs
+++ b/RAM_Adapter/Read/Grid.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -91,3 +91,4 @@ private List<Grid> ReadGrid(List<string> ids = null)
 
 
 
+
diff --git a/RAM_Adapter/Read/Level.cs b/RAM_Adapter/Read/Level.cs
index d5567d3..a1b47c0 100644
--- a/RAM_Adapter/Read/Level.cs
+++ b/RAM_Adapter/Read/Level.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -77,3 +77,4 @@ private List<Level> ReadLevel(List<string> ids = null)
 
 
 
+
diff --git a/RAM_Adapter/Read/Loads.cs b/RAM_Adapter/Read/Loads.cs
index 0a1441c..9e632c0 100644
--- a/RAM_Adapter/Read/Loads.cs
+++ b/RAM_Adapter/Read/Loads.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -299,3 +299,4 @@ private List<RAMLineGravityLoad> ReadLineGravityLoad(List<string> ids = null)
 
 
 
+
diff --git a/RAM_Adapter/Read/MaterialFragment.cs b/RAM_Adapter/Read/MaterialFragment.cs
index 54b131d..73678cc 100644
--- a/RAM_Adapter/Read/MaterialFragment.cs
+++ b/RAM_Adapter/Read/MaterialFragment.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -72,3 +72,4 @@ private List<IMaterialFragment> ReadMaterials(List<string> ids = null)
 
 
 
+
diff --git a/RAM_Adapter/Read/Panel.cs b/RAM_Adapter/Read/Panel.cs
index 6221df9..a377eec 100644
--- a/RAM_Adapter/Read/Panel.cs
+++ b/RAM_Adapter/Read/Panel.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -153,3 +153,4 @@ private List<IWall> ReadRamWalls(IModel ramModel)
 
 
 
+
diff --git a/RAM_Adapter/Read/Results.cs b/RAM_Adapter/Read/Results.cs
index 39d97cb..3fdca25 100644
--- a/RAM_Adapter/Read/Results.cs
+++ b/RAM_Adapter/Read/Results.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -135,3 +135,4 @@ private List<RAMFactoredEndReactions> ReadBeamEndReactions(List<string> ids = nu
 
 
 
+
diff --git a/RAM_Adapter/Read/SectionProperty.cs b/RAM_Adapter/Read/SectionProperty.cs
index 2e5e460..1438dda 100644
--- a/RAM_Adapter/Read/SectionProperty.cs
+++ b/RAM_Adapter/Read/SectionProperty.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -77,3 +77,4 @@ private List<ISectionProperty> ReadSectionProperties(List<string> ids = null)
 
 
 
+
diff --git a/RAM_Adapter/Read/SurfaceProperty.cs b/RAM_Adapter/Read/SurfaceProperty.cs
index 485c181..17454f1 100644
--- a/RAM_Adapter/Read/SurfaceProperty.cs
+++ b/RAM_Adapter/Read/SurfaceProperty.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -153,3 +153,4 @@ private List<ISurfaceProperty> ReadISurfaceProperties(List<string> ids = null)
 
 
 
+
diff --git a/RAM_Adapter/Read/UniformLoadSet.cs b/RAM_Adapter/Read/UniformLoadSet.cs
index 7f47e57..80714d4 100644
--- a/RAM_Adapter/Read/UniformLoadSet.cs
+++ b/RAM_Adapter/Read/UniformLoadSet.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -74,3 +74,4 @@ private List<UniformLoadSet> ReadUniformLoadSets(List<string> ids = null)
 
 
 
+
diff --git a/RAM_Adapter/Read/_Read.cs b/RAM_Adapter/Read/_Read.cs
index 553f249..de37d1a 100644
--- a/RAM_Adapter/Read/_Read.cs
+++ b/RAM_Adapter/Read/_Read.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -97,3 +97,4 @@ protected override IEnumerable<IBHoMObject> IRead(Type type, IList ids, ActionCo
 
 
 
+
diff --git a/RAM_Adapter/Types/Comparer.cs b/RAM_Adapter/Types/Comparer.cs
index 24549ed..fe51c20 100644
--- a/RAM_Adapter/Types/Comparer.cs
+++ b/RAM_Adapter/Types/Comparer.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -28,6 +28,7 @@
 using BH.oM.Structure.MaterialFragments;
 using System;
 using System.Collections.Generic;
+using BH.Engine.Structure;
 
 namespace BH.Adapter.RAM
 {
@@ -47,10 +48,10 @@ protected void SetupComparers()
             AdapterComparers = new Dictionary<Type, object>
             {
                 {typeof(Node), new BH.Engine.Structure.NodeDistanceComparer(3) },   //The 3 in here sets how many decimal places to look at for node merging. 3 decimal places gives mm precision
-                {typeof(ISectionProperty), new BHoMObjectNameOrToStringComparer() },
-                {typeof(IMaterialFragment), new BHoMObjectNameComparer() },
-                {typeof(LinkConstraint), new BHoMObjectNameComparer() },
-                {typeof(ISurfaceProperty), new BHoMObjectNameComparer() },
+                {typeof(ISectionProperty), new NameOrDescriptionComparer() },
+                {typeof(IMaterialFragment), new NameOrDescriptionComparer() },
+                {typeof(LinkConstraint), new NameOrDescriptionComparer() },
+                {typeof(ISurfaceProperty), new NameOrDescriptionComparer() },
             };
         }
 
@@ -60,3 +61,4 @@ protected void SetupComparers()
 }
 
 
+
diff --git a/RAM_Adapter/Types/DependencyTypes.cs b/RAM_Adapter/Types/DependencyTypes.cs
index 9782ed1..5ba5232 100644
--- a/RAM_Adapter/Types/DependencyTypes.cs
+++ b/RAM_Adapter/Types/DependencyTypes.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -62,3 +62,4 @@ protected void SetupDependencies()
 
 
 
+
diff --git a/RAM_Adapter/Update/Bar.cs b/RAM_Adapter/Update/Bar.cs
index a1276b1..1dab1f6 100644
--- a/RAM_Adapter/Update/Bar.cs
+++ b/RAM_Adapter/Update/Bar.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -99,3 +99,4 @@ protected bool Update(IEnumerable<Bar> bars)
 
 
 
+
diff --git a/RAM_Adapter/Update/_UpdateObjects.cs b/RAM_Adapter/Update/_UpdateObjects.cs
index eb65258..e415538 100644
--- a/RAM_Adapter/Update/_UpdateObjects.cs
+++ b/RAM_Adapter/Update/_UpdateObjects.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -67,3 +67,4 @@ protected bool Update(IEnumerable<IBHoMObject> bhomObjects)
 
 
 
+
diff --git a/RAM_Engine/Create/UniformLoadSet/RAMUniformLoadSet.cs b/RAM_Engine/Create/UniformLoadSet/RAMUniformLoadSet.cs
index d92987b..d667504 100644
--- a/RAM_Engine/Create/UniformLoadSet/RAMUniformLoadSet.cs
+++ b/RAM_Engine/Create/UniformLoadSet/RAMUniformLoadSet.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -73,3 +73,4 @@ public static UniformLoadSet RAMUniformLoadSet(double sdl, double cdl, double li
 }
 
 
+
diff --git a/RAM_Engine/Properties/AssemblyInfo.cs b/RAM_Engine/Properties/AssemblyInfo.cs
index 2d253de..fa959c8 100644
--- a/RAM_Engine/Properties/AssemblyInfo.cs
+++ b/RAM_Engine/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -55,7 +55,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
+[assembly: AssemblyFileVersion("6.1.0.0")]
+
 
 
 
diff --git a/RAM_oM/Enums/RAMLoadCases.cs b/RAM_oM/Enums/RAMLoadCases.cs
index 4c3c4c6..647b265 100644
--- a/RAM_oM/Enums/RAMLoadCases.cs
+++ b/RAM_oM/Enums/RAMLoadCases.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -38,3 +38,4 @@ public enum RAMLiveLoadTypes
 }
 
 
+
diff --git a/RAM_oM/Fragments/RAMDeckData.cs b/RAM_oM/Fragments/RAMDeckData.cs
index 00629a3..3a8cfe9 100644
--- a/RAM_oM/Fragments/RAMDeckData.cs
+++ b/RAM_oM/Fragments/RAMDeckData.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -39,3 +39,4 @@ public class RAMDeckData : IFragment
     }
 }
 
+
diff --git a/RAM_oM/Fragments/RAMFrameData.cs b/RAM_oM/Fragments/RAMFrameData.cs
index 4fab1ce..46fc52e 100644
--- a/RAM_oM/Fragments/RAMFrameData.cs
+++ b/RAM_oM/Fragments/RAMFrameData.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -72,3 +72,4 @@ public class RAMFrameData : IFragment
     }
 }
 
+
diff --git a/RAM_oM/Fragments/RAMGridData.cs b/RAM_oM/Fragments/RAMGridData.cs
index 227ee7f..248cb7a 100644
--- a/RAM_oM/Fragments/RAMGridData.cs
+++ b/RAM_oM/Fragments/RAMGridData.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -51,3 +51,4 @@ public class RAMGridData : IFragment
     }
 }
 
+
diff --git a/RAM_oM/Fragments/RAMId.cs b/RAM_oM/Fragments/RAMId.cs
index 278472c..0c6d9ac 100644
--- a/RAM_oM/Fragments/RAMId.cs
+++ b/RAM_oM/Fragments/RAMId.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -42,3 +42,4 @@ public class RAMId : IAdapterId
     }
 }
 
+
diff --git a/RAM_oM/Fragments/RAMNodeForceData.cs b/RAM_oM/Fragments/RAMNodeForceData.cs
index 9c917ce..56741df 100644
--- a/RAM_oM/Fragments/RAMNodeForceData.cs
+++ b/RAM_oM/Fragments/RAMNodeForceData.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -60,3 +60,4 @@ public class RAMNodeForceData : IFragment
     }
 }
 
+
diff --git a/RAM_oM/Properties/AssemblyInfo.cs b/RAM_oM/Properties/AssemblyInfo.cs
index 1d667c2..ab8d3d4 100644
--- a/RAM_oM/Properties/AssemblyInfo.cs
+++ b/RAM_oM/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -55,7 +55,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
+[assembly: AssemblyFileVersion("6.1.0.0")]
+
 
 
 
diff --git a/RAM_oM/Results/RAMFactoredEndReactions.cs b/RAM_oM/Results/RAMFactoredEndReactions.cs
index aba7206..d785d5b 100644
--- a/RAM_oM/Results/RAMFactoredEndReactions.cs
+++ b/RAM_oM/Results/RAMFactoredEndReactions.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -47,3 +47,4 @@ public class RAMFactoredEndReactions : BHoMObject
 }
 
 
+
diff --git a/RAM_oM/Results/RAMLineGravityLoad.cs b/RAM_oM/Results/RAMLineGravityLoad.cs
index 4a5b1b2..d1be3aa 100644
--- a/RAM_oM/Results/RAMLineGravityLoad.cs
+++ b/RAM_oM/Results/RAMLineGravityLoad.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -53,3 +53,4 @@ public class RAMLineGravityLoad : BHoMObject
 }
 
 
+
diff --git a/RAM_oM/Results/RAMPointGravityLoad.cs b/RAM_oM/Results/RAMPointGravityLoad.cs
index 738c367..2c833aa 100644
--- a/RAM_oM/Results/RAMPointGravityLoad.cs
+++ b/RAM_oM/Results/RAMPointGravityLoad.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -51,3 +51,4 @@ public class RAMPointGravityLoad : BHoMObject
 }
 
 
+