diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index a05a52f2..db2a749d 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 73ac90f9..a0e308dc 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 ff514977..e325738a 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/FileFormats/BCRES/BCRES.cs b/Switch_FileFormatsMain/FileFormats/BCRES/BCRES.cs
index 575b1e00..655a7aee 100644
--- a/Switch_FileFormatsMain/FileFormats/BCRES/BCRES.cs
+++ b/Switch_FileFormatsMain/FileFormats/BCRES/BCRES.cs
@@ -87,11 +87,11 @@ namespace FirstPlugin
         public void LoadEditors(TreeNode Wrapper, Action OnPropertyChanged)
         {
             if (Wrapper is MTOBWrapper) {
-                LoadPropertyGrid(Wrapper, OnPropertyChanged);
+                LoadPropertyGrid(((MTOBWrapper)Wrapper).Material, OnPropertyChanged);
             }
 
             if (Wrapper is CMDLWrapper) {
-                LoadPropertyGrid(Wrapper, OnPropertyChanged);
+                LoadPropertyGrid(((CMDLWrapper)Wrapper).Model, OnPropertyChanged);
             }
         }
 
diff --git a/Switch_FileFormatsMain/FileFormats/BCRES/Wrappers/CMDL/CMDLWrapper.cs b/Switch_FileFormatsMain/FileFormats/BCRES/Wrappers/CMDL/CMDLWrapper.cs
index d60e30e9..d2a27cab 100644
--- a/Switch_FileFormatsMain/FileFormats/BCRES/Wrappers/CMDL/CMDLWrapper.cs
+++ b/Switch_FileFormatsMain/FileFormats/BCRES/Wrappers/CMDL/CMDLWrapper.cs
@@ -36,6 +36,15 @@ namespace FirstPlugin
         {
             Model = model;
             Text = model.Name;
+
+            var MaterialFolder = new TreeNode();
+            Nodes.Add(MaterialFolder);
+            foreach (var material in model.Materials.Values)
+            {
+                var matWrapper = new MTOBWrapper();
+                matWrapper.Load(material);
+                MaterialFolder.Nodes.Add(matWrapper);
+            }
         }
     }
 }