diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index acbb6d8c..ec453d2e 100644
Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ
diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
index 2f98e943..ba918f0e 100644
Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ
diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
index 548f6d89..f9d07008 100644
Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
index f311012b..40f98eed 100644
Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Switch_Toolbox_Library/Forms/Editors/ObjectEditor.cs b/Switch_Toolbox_Library/Forms/Editors/ObjectEditor.cs
index e0affe1f..a548d2aa 100644
--- a/Switch_Toolbox_Library/Forms/Editors/ObjectEditor.cs
+++ b/Switch_Toolbox_Library/Forms/Editors/ObjectEditor.cs
@@ -43,18 +43,28 @@ namespace Switch_Toolbox.Library.Forms
 
         public void AddNode(TreeNode node, bool ClearAllNodes = false)
         {
-            // Invoke the treeview to add the nodes
-            treeViewCustom1.Invoke((Action)delegate ()
+            if (treeViewCustom1.InvokeRequired)
             {
-                treeViewCustom1.BeginUpdate(); // No visual updates until we say 
-              //  if (ClearAllNodes)
-               //     ClearNodes();
-               
-                treeViewCustom1.EndUpdate(); // Allow the treeview to update visually
-            });
+                // Invoke the treeview to add the nodes
+                treeViewCustom1.Invoke((Action)delegate ()
+                {
+                    AddNodes(node, ClearAllNodes);
+                });
+            }
+            else
+            {
+                AddNodes(node, ClearAllNodes);
+            }
+            //       _fieldsTreeCache.Nodes.Add(node);
+        }
 
+        private void AddNodes(TreeNode node, bool ClearAllNodes = false)
+        {
+            treeViewCustom1.BeginUpdate(); // No visual updates until we say 
+            if (ClearAllNodes)
+                ClearNodes();
             treeViewCustom1.Nodes.Add(node); // Add the new nodes
-     //       _fieldsTreeCache.Nodes.Add(node);
+            treeViewCustom1.EndUpdate(); // Allow the treeview to update visually
         }
 
         public void ClearNodes()