diff --git a/agents/meshcore.js b/agents/meshcore.js
index 151058c5..cb9d7ec3 100644
--- a/agents/meshcore.js
+++ b/agents/meshcore.js
@@ -3238,7 +3238,7 @@ function processConsoleCommand(cmd, args, rights, sessionid) {
                 var fin = '', f = '', availcommands = 'translations,agentupdate,errorlog,msh,timerinfo,coreinfo,coredump,service,fdsnapshot,fdcount,startupoptions,alert,agentsize,versions,help,info,osinfo,args,print,type,dbkeys,dbget,dbset,dbcompact,eval,parseuri,httpget,wslist,plugin,wsconnect,wssend,wsclose,notify,ls,ps,kill,netinfo,location,power,wakeonlan,setdebug,smbios,rawsmbios,toast,lock,users,openurl,getscript,getclip,setclip,log,av,cpuinfo,sysinfo,apf,scanwifi,wallpaper,agentmsg,task';
                 if (require('os').dns != null) { availcommands += ',dnsinfo'; }
                 try { require('linux-dhcp'); availcommands += ',dhcp'; } catch (ex) { }
-                if (process.platform == 'win32') { availcommands += ',cs,safemode,wpfhwacceleration,uac'; }
+                if (process.platform == 'win32') { availcommands += ',cs,safemode,wpfhwacceleration,uac,volumes'; }
                 if (amt != null) { availcommands += ',amt,amtconfig,amtevents'; }
                 if (process.platform != 'freebsd') { availcommands += ',vm'; }
                 if (require('MeshAgent').maxKvmTileSize != null) { availcommands += ',kvmmode'; }
@@ -3257,6 +3257,9 @@ function processConsoleCommand(cmd, args, rights, sessionid) {
                 response = JSON.stringify(coretranslations, null, 2);
                 break;
             }
+            case 'volumes':
+                response = JSON.stringify(require('win-volumes').getVolumes(), null, 1);
+                break;
             case 'dhcp': // This command is only supported on Linux, this is because Linux does not give us the DNS suffix for each network adapter independently so we have to ask the DHCP server.
                 {
                     try { require('linux-dhcp'); } catch (ex) { response = 'Unknown command "dhcp", type "help" for list of avaialble commands.'; break; }
diff --git a/agents/modules_meshcore/win-volumes.js b/agents/modules_meshcore/win-volumes.js
new file mode 100644
index 00000000..e0e11276
--- /dev/null
+++ b/agents/modules_meshcore/win-volumes.js
@@ -0,0 +1,55 @@
+/*
+Copyright 2022 Intel Corporation
+@author Bryan Roe
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+*/
+
+function trimObject(j)
+{
+    var i;
+    for(i in j)
+    {
+        if (j[i] == null || (typeof(j[i])=='string' && j[i]=='') || i.startsWith('__')) { delete j[i];}
+    }
+    if (j['SerialNumber'] < 0) { var tmp = Buffer.alloc(4); tmp.writeInt32LE(j['SerialNumber']); j['SerialNumber'] = tmp.readUInt32LE(); }
+    return (j);
+}
+
+
+function getVolumes()
+{
+    var v = require('win-wmi').query('ROOT\\CIMV2', 'SELECT * FROM Win32_Volume');
+    var i;
+
+    var ret = {};
+
+    for (i in v)
+    {
+        ret[v[i].DeviceID] = trimObject(v[i]);
+    }
+
+    v = require('win-wmi').query('ROOT\\CIMV2\\Security\\MicrosoftVolumeEncryption', 'SELECT * FROM Win32_EncryptableVolume');
+    for (i in v)
+    {
+        var tmp = trimObject(v[i]);
+        for (var k in tmp)
+        {
+            ret[tmp.DeviceID][k] = tmp[k];
+        }
+    }
+    return (ret);
+}
+
+module.exports = { getVolumes: function () { try { return (getVolumes()); } catch (x) { return ({}); } } };
\ No newline at end of file