diff --git a/MatterControl.sln b/MatterControl.sln
index cd14f2853..edc1a4d47 100644
--- a/MatterControl.sln
+++ b/MatterControl.sln
@@ -62,8 +62,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MatterSlice", "MatterSlice"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pathfinding", "Submodules\MatterSlice\Pathfinding\Pathfinding.csproj", "{8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuadTree", "Submodules\MatterSlice\QuadTree\QuadTree.csproj", "{23EC3364-7C93-4169-9AB2-7181C66004C0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSClipperLib", "Submodules\MatterSlice\MSClipperLib\MSClipperLib.csproj", "{2C564BE1-352D-4DDB-8226-F0981F983C60}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MeshThumbnails", "Submodules\agg-sharp\MeshThumbnails\MeshThumbnails\MeshThumbnails.csproj", "{1A901129-C885-425F-8D4B-86698F98A2B4}"
@@ -110,6 +108,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MarkdigAgg", "Submodules\ag
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuadTree", "Submodules\agg-sharp\QuadTree\QuadTree.csproj", "{BC5C99D6-1801-4ED5-828F-66AF08923909}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuadTreeMS", "Submodules\MatterSlice\QuadTree\QuadTreeMS.csproj", "{969BF4D3-F641-4F9E-893C-4C3762AB0B52}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -208,10 +208,6 @@ Global
 		{8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23EC3364-7C93-4169-9AB2-7181C66004C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23EC3364-7C93-4169-9AB2-7181C66004C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23EC3364-7C93-4169-9AB2-7181C66004C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23EC3364-7C93-4169-9AB2-7181C66004C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2C564BE1-352D-4DDB-8226-F0981F983C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2C564BE1-352D-4DDB-8226-F0981F983C60}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2C564BE1-352D-4DDB-8226-F0981F983C60}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -292,6 +288,10 @@ Global
 		{BC5C99D6-1801-4ED5-828F-66AF08923909}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC5C99D6-1801-4ED5-828F-66AF08923909}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC5C99D6-1801-4ED5-828F-66AF08923909}.Release|Any CPU.Build.0 = Release|Any CPU
+		{969BF4D3-F641-4F9E-893C-4C3762AB0B52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{969BF4D3-F641-4F9E-893C-4C3762AB0B52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{969BF4D3-F641-4F9E-893C-4C3762AB0B52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{969BF4D3-F641-4F9E-893C-4C3762AB0B52}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -320,7 +320,6 @@ Global
 		{94838988-523C-4B11-AD82-8B9B76F23A31} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
 		{418E7058-92EE-4329-86BA-AC26B65AFB25} = {FBE6DF29-85A9-4A8B-B739-35BE4CA0A9B7}
 		{8CB3464F-6130-4EDB-8DC6-CCD2697FAFBB} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63}
-		{23EC3364-7C93-4169-9AB2-7181C66004C0} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63}
 		{2C564BE1-352D-4DDB-8226-F0981F983C60} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63}
 		{1A901129-C885-425F-8D4B-86698F98A2B4} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
 		{CBDEEC31-D688-417B-9BF2-F0DB2E4FB268} = {FED00F38-E911-45E1-A788-26980E84C3D6}
@@ -342,6 +341,7 @@ Global
 		{A1F2F1DA-2B86-461E-9602-EAB2BD899A8F} = {FBE6DF29-85A9-4A8B-B739-35BE4CA0A9B7}
 		{C0E747D6-53CA-4747-B581-D175DCDD085F} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
 		{BC5C99D6-1801-4ED5-828F-66AF08923909} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
+		{969BF4D3-F641-4F9E-893C-4C3762AB0B52} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {42D74E06-00EA-43D2-A05B-9BEAD4A2C8A0}