diff --git a/MatterControlLib/Library/Providers/MatterControl/ComputerCollectionContainer.cs b/MatterControlLib/Library/Providers/MatterControl/ComputerCollectionContainer.cs
index 2d9067cef..5a4598c1e 100644
--- a/MatterControlLib/Library/Providers/MatterControl/ComputerCollectionContainer.cs
+++ b/MatterControlLib/Library/Providers/MatterControl/ComputerCollectionContainer.cs
@@ -27,6 +27,7 @@ of the authors and should not be interpreted as representing official policies,
 either expressed or implied, of the FreeBSD Project.
 */
 
+using System;
 using System.IO;
 using MatterHackers.Agg;
 using MatterHackers.Agg.Platform;
@@ -95,7 +96,24 @@ namespace MatterHackers.MatterControl.Library
 						}));
 			}
 
-			if (ProfileManager.Instance != null)
+            foreach (var drive in DriveInfo.GetDrives())
+            {
+                this.ChildContainers.Add(
+                    new DynamicContainerLink(
+                        drive.Name,
+                        StaticData.Instance.LoadIcon(Path.Combine("Library", "folder.png")),
+                        StaticData.Instance.LoadIcon(Path.Combine("Library", "hard-drive.png")),
+                        () => new FileSystemContainer(drive.RootDirectory.FullName)
+                        {
+                            UseIncrementedNameDuringTypeChange = true,
+                            DefaultSort = new LibrarySortBehavior()
+                            {
+                                SortKey = SortKey.ModifiedDate,
+                            }
+                        }));
+            }
+
+            if (ProfileManager.Instance != null)
 			{
 				var userDirectory = ProfileManager.Instance.UserProfilesDirectory;
 				var libraryFiles = Directory.GetFiles(userDirectory, "*.library");
diff --git a/StaticData/Icons/Library/hard-drive.png b/StaticData/Icons/Library/hard-drive.png
new file mode 100644
index 000000000..ca0582b1a
Binary files /dev/null and b/StaticData/Icons/Library/hard-drive.png differ
diff --git a/StaticData/Icons/Library/hard-drive.svg b/StaticData/Icons/Library/hard-drive.svg
new file mode 100644
index 000000000..d86b517a8
--- /dev/null
+++ b/StaticData/Icons/Library/hard-drive.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200pt" height="1200pt" version="1.1" viewBox="0 0 1200 1200" xmlns="http://www.w3.org/2000/svg">
+ <path d="m1195.7 774.73-170.89-590.41c-8.375-24.121-31.105-40.297-56.652-40.32h-736.31c-26.039 0.16797-49.055 16.992-57.121 41.762l-170.4 588.48c-2.8906 9.3242-4.3555 19.043-4.3203 28.801v204.96c0 53.016 42.984 96 96 96h1008c53.016 0 96-42.984 96-96v-204.96c-0.023438-9.6094-1.4766-19.152-4.3086-28.309zm-974.89-574.57c1.6094-4.7656 6.0117-8.0156 11.039-8.1602h736.32c4.6797-0.097656 8.9883 2.5195 11.039 6.7188l152.16 525.59c-8.8672-2.7383-18.082-4.1875-27.359-4.3086h-1008c-9.2773 0.12109-18.504 1.5703-27.359 4.3086zm931.2 807.84c0 26.508-21.492 48-48 48h-1008c-26.508 0-48-21.492-48-48v-192c0-26.508 21.492-48 48-48h1008c26.508 0 48 21.492 48 48zm-912-96c0 26.508-21.492 48-48 48s-48-21.492-48-48 21.492-48 48-48 48 21.492 48 48zm144 0c0 26.508-21.492 48-48 48s-48-21.492-48-48 21.492-48 48-48 48 21.492 48 48zm144 0c0 26.508-21.492 48-48 48s-48-21.492-48-48 21.492-48 48-48 48 21.492 48 48zm96-48h432v48h-432z"/>
+</svg>
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 2b3175da4..7402c44c7 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 2b3175da4640913781a8b41e782199bb10c8448b
+Subproject commit 7402c44c7895eb96df6abcd48fb760a2f2bcf8d9