diff --git a/MeshCentral b/MeshCentral
deleted file mode 160000
index b6bfdbbc..00000000
--- a/MeshCentral
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b6bfdbbc91375c12700a81048f29b6fc5dfd3e96
diff --git a/agents/MeshConsole.exe b/agents/MeshConsole.exe
deleted file mode 100644
index d2e7dde8..00000000
Binary files a/agents/MeshConsole.exe and /dev/null differ
diff --git a/agents/MeshConsole64.exe b/agents/MeshConsole64.exe
deleted file mode 100644
index 37337e77..00000000
Binary files a/agents/MeshConsole64.exe and /dev/null differ
diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe
new file mode 100644
index 00000000..8d89b377
Binary files /dev/null and b/agents/MeshService-signed.exe differ
diff --git a/agents/MeshService.exe b/agents/MeshService.exe
index 25812eb1..611d131b 100644
Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ
diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe
new file mode 100644
index 00000000..1ceccf1e
Binary files /dev/null and b/agents/MeshService64-signed.exe differ
diff --git a/agents/MeshService64.exe b/agents/MeshService64.exe
index 8ecbf8c5..4616dbfc 100644
Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ
diff --git a/agents/TestSuite.db b/agents/TestSuite.db
deleted file mode 100644
index 5aeec57d..00000000
Binary files a/agents/TestSuite.db and /dev/null differ
diff --git a/agents/agent_debug/MeshService.exe b/agents/agent_debug/MeshService.exe
deleted file mode 100644
index 257fa188..00000000
Binary files a/agents/agent_debug/MeshService.exe and /dev/null differ
diff --git a/agents/agent_debug/MeshService64.exe b/agents/agent_debug/MeshService64.exe
deleted file mode 100644
index bfe22f32..00000000
Binary files a/agents/agent_debug/MeshService64.exe and /dev/null differ
diff --git a/agents/meshagent_arm b/agents/meshagent_arm
index 41b8e031..d2886c33 100644
Binary files a/agents/meshagent_arm and b/agents/meshagent_arm differ
diff --git a/agents/meshagent_arm-linaro b/agents/meshagent_arm-linaro
deleted file mode 100644
index 59945223..00000000
Binary files a/agents/meshagent_arm-linaro and /dev/null differ
diff --git a/agents/meshagent_mips b/agents/meshagent_mips
deleted file mode 100644
index d8de3127..00000000
Binary files a/agents/meshagent_mips and /dev/null differ
diff --git a/agents/meshagent_pi2 b/agents/meshagent_pi2
deleted file mode 100644
index 8843cc13..00000000
Binary files a/agents/meshagent_pi2 and /dev/null differ
diff --git a/agents/meshagent_pogo b/agents/meshagent_pogo
index 5b3c0420..7194d555 100644
Binary files a/agents/meshagent_pogo and b/agents/meshagent_pogo differ
diff --git a/agents/meshagent_poky b/agents/meshagent_poky
index b36e63ec..5787e547 100644
Binary files a/agents/meshagent_poky and b/agents/meshagent_poky differ
diff --git a/agents/meshagent_poky64 b/agents/meshagent_poky64
index 62d7af24..338ac10a 100644
Binary files a/agents/meshagent_poky64 and b/agents/meshagent_poky64 differ
diff --git a/agents/meshagent_x86 b/agents/meshagent_x86
index 15d03e61..5c124301 100644
Binary files a/agents/meshagent_x86 and b/agents/meshagent_x86 differ
diff --git a/agents/meshagent_x86-64 b/agents/meshagent_x86-64
index f044470f..216f9dd3 100644
Binary files a/agents/meshagent_x86-64 and b/agents/meshagent_x86-64 differ
diff --git a/agents/meshagent_x86-64_nokvm b/agents/meshagent_x86-64_nokvm
index aaa32962..ce44d1c8 100644
Binary files a/agents/meshagent_x86-64_nokvm and b/agents/meshagent_x86-64_nokvm differ
diff --git a/agents/meshagent_x86_nokvm b/agents/meshagent_x86_nokvm
index 72e820f7..c2223db9 100644
Binary files a/agents/meshagent_x86_nokvm and b/agents/meshagent_x86_nokvm differ
diff --git a/agents/meshcmd.js b/agents/meshcmd.js
index 5f1e8e47..1c32f0fa 100644
--- a/agents/meshcmd.js
+++ b/agents/meshcmd.js
@@ -455,15 +455,15 @@ function startLms(func) {
             setupMeiOsAdmin(func, amtLms.connected == false ? 0 : 3);
         });
         amtLms.on('notify', function (data, options, str, code) {
-            if (str != null) {
+            if (code == 'iAMT0052-3') {
+                kvmGetData(true);
+            } else if (str != null) {
                 var notify = { date: Date.now(), str: str, code: code };
                 lmsNotifications.push(notify);
                 while (lmsNotifications.length > 100) { lmsNotifications.shift(); }
                 var notifyBuf = Buffer.concat([Buffer.from('0900', 'hex'), Buffer.from(JSON.stringify(notify))]) // Add a notification
                 for (var i in lmsControlSockets) { lmsControlSockets[i].write(notifyBuf); }
-                //console.log(str);
             }
-            //else { console.log(JSON.stringify(data)); }
         });
         //console.log('LME Connecting...');
         amtLms.on('connect', function () {
@@ -539,9 +539,79 @@ function setupMeiOsAdmin(func, state) {
         if (func) { func(state); }
         //var AllWsman = "CIM_SoftwareIdentity,IPS_SecIOService,IPS_ScreenSettingData,IPS_ProvisioningRecordLog,IPS_HostBasedSetupService,IPS_HostIPSettings,IPS_IPv6PortSettings".split(',');
         //osamtstack.BatchEnum(null, AllWsman, startLmsWsmanResponse, null, true);
+
+        tempTimer = setInterval(function () { kvmGetData(true); }, 2000);
+        kvmGetData(false);
+        kvmSetData(JSON.stringify({ action: 'restart', ver: 1 }));
     });
 }
 
+function kvmGetData(tag) {
+    osamtstack.IPS_KVMRedirectionSettingData_DataChannelRead(kvmDataGetResponse, tag);
+}
+
+function kvmDataGetResponse(stack, name, response, status, tag) {
+    if ((tag == true) && (status == 200) && (response.Body.ReturnValue == 0)) {
+        var val = null;
+        try { val = Buffer.from(response.Body.DataMessage, 'base64').toString(); } catch (e) { return }
+        if (val != null) kvmProcessData(response.Body.RealmsBitmap, response.Body.MessageId, val);
+    }
+}
+
+var webRtcDesktop = null;
+function kvmProcessData(realms, messageId, val) {
+    //console.log('kvmProcessData', val);
+    var data = null;
+    try { data = JSON.parse(val) } catch (e) { }
+    if ((data != null) && (data.action)) {
+        if (data.action == 'present') { kvmSetData(JSON.stringify({ action: 'present', ver: 1 })); }
+        if (data.action == 'offer') {
+            webRtcDesktop = {};
+            var rtc = require('ILibWebRTC');
+            webRtcDesktop.webrtc = rtc.createConnection();
+            webRtcDesktop.webrtc.on('connected', function () { });
+            webRtcDesktop.webrtc.on('disconnected', function () { webRtcCleanUp(); });
+            webRtcDesktop.webrtc.on('dataChannel', function (rtcchannel) {
+                webRtcDesktop.rtcchannel = rtcchannel;
+                var kvmmodule = require('meshDesktop');
+                webRtcDesktop.kvm = kvmmodule.getRemoteDesktopStream();
+                webRtcDesktop.kvm.pipe(webRtcDesktop.rtcchannel, { end: false });
+                webRtcDesktop.rtcchannel.pipe(webRtcDesktop.kvm, { end: false });
+                webRtcDesktop.rtcchannel.on('end', function () { webRtcCleanUp(); });
+                //webRtcDesktop.kvm.on('end', function () { console.log('WebRTC DataChannel closed2'); webRtcCleanUp(); });
+                //webRtcDesktop.rtcchannel.on('data', function (data) { console.log('WebRTC data: ' + data); });
+            });
+            kvmSetData(JSON.stringify({ action: 'answer', ver: 1, sdp: webRtcDesktop.webrtc.setOffer(data.sdp) }));
+        }
+    }
+}
+
+function webRtcCleanUp() {
+    if (webRtcDesktop == null) return;
+    if (webRtcDesktop.rtcchannel) {
+        try { webRtcDesktop.rtcchannel.close(); } catch (e) { }
+        try { webRtcDesktop.rtcchannel.removeAllListeners('data'); } catch (e) { }
+        try { webRtcDesktop.rtcchannel.removeAllListeners('end'); } catch (e) { }
+        delete webRtcDesktop.rtcchannel;
+    }
+    if (webRtcDesktop.webrtc) {
+        try { webRtcDesktop.webrtc.close(); } catch (e) { }
+        try { webRtcDesktop.webrtc.removeAllListeners('connected'); } catch (e) { }
+        try { webRtcDesktop.webrtc.removeAllListeners('disconnected'); } catch (e) { }
+        try { webRtcDesktop.webrtc.removeAllListeners('dataChannel'); } catch (e) { }
+        delete webRtcDesktop.webrtc;
+    }
+    if (webRtcDesktop.kvm) {
+        try { webRtcDesktop.kvm.end(); } catch (e) { }
+        delete webRtcDesktop.kvm;
+    }
+    webRtcDesktop = null;
+}
+
+function kvmSetData(x) {
+    osamtstack.IPS_KVMRedirectionSettingData_DataChannelWrite(Buffer.from(x).toString('base64'), function () { });
+}
+
 function startLmsWsmanResponse(stack, name, responses, status) {
     if (status == 600) { console.log('ERROR: Unable to connect to Intel(R) AMT.'); }
     else if (status != 200) { console.log('ERROR: Unable to get object from Intel(R) AMT, status = ' + status + '.'); }
@@ -590,7 +660,7 @@ function processLmsControlData(data) {
 
 function startRouter() {
     tcpserver = net.createServer(OnTcpClientConnected);
-    tcpserver.on('error', function (e) { console.log('ERRORa: ' + JSON.stringify(e)); exit(0); return; });
+    tcpserver.on('error', function (e) { console.log('ERROR: ' + JSON.stringify(e)); exit(0); return; });
     tcpserver.listen(settings.localPort, function () {
         // We started listening.
         if (settings.remoteName == null) {
diff --git a/agents/meshcore.js b/agents/meshcore.js
index d349dce7..24b3a626 100644
--- a/agents/meshcore.js
+++ b/agents/meshcore.js
@@ -802,7 +802,12 @@ function createMeshCore(agent) {
             var response = null;
             switch (cmd) {
                 case 'help': { // Displays available commands
-                    response = 'Available commands: help, info, args, print, type, dbget, dbset, dbcompact, eval, parseuri, httpget,\r\nwslist, wsconnect, wssend, wsclose, notify, ls, amt, netinfo, location, power, wakeonlan, scanwifi, scanamt.';
+                    response = 'Available commands: help, info, args, print, type, dbget, dbset, dbcompact, eval, parseuri, httpget,\r\nwslist, wsconnect, wssend, wsclose, notify, ls, amt, netinfo, location, power, wakeonlan, scanwifi, scanamt, setdebug.';
+                    break;
+                }
+                case 'setdebug': {
+                    if (args['_'].length < 1) { response = 'Proper usage: setdebug (target), 0 = StdOut, 1 = This Console, * = All Consoles, 2 = WebLog, 3 = Disabled'; } // Display usage
+                    else { if (args['_'][0] == '*') { console.setDestination(1); } else { console.setDestination(parseInt(args['_'][0]), sessionid); } }
                     break;
                 }
                 case 'eval': { // Eval JavaScript
diff --git a/agents/meshinstall-linux-old.sh b/agents/meshinstall-linux-old.sh
deleted file mode 100644
index 180045cd..00000000
--- a/agents/meshinstall-linux-old.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/bash
-
-CheckStartupType() {
-#  echo "Checking process autostart system..."
-  if [[ `systemctl` =~ -\.mount ]]; then return 1; # systemd;
-  elif [[ `/sbin/init --version` =~ upstart ]]; then return 2; # upstart;
-  elif [[ -f /etc/init.d/cron && ! -h /etc/init.d/cron ]]; then return 3; # sysv-init;
-  fi
-  return 0;
-}
-
-# Add "StartupType=(type)" to .msh file
-UpdateMshFile() {
-  # Remove all lines that start with "StartupType="
-  sed '/^StartupType=/ d' < /usr/local/mesh/meshagent.msh >> /usr/local/mesh/meshagent2.msh
-  # Add the startup type to the file
-  echo "StartupType=$starttype" >> /usr/local/mesh/meshagent2.msh
-  mv /usr/local/mesh/meshagent2.msh /usr/local/mesh/meshagent.msh
-}
-
-CheckInstallAgent() {
-#  echo "Checking mesh identifier..."
-  if [ -e "/usr/local" ]
-  then
-    installpath="/usr/local/mesh"
-  else
-    installpath="/usr/mesh"
-  fi
-  if [ $# -eq 2 ]
-  then
-    url=$1
-    meshid=$2
-    meshidlen=${#meshid}
-    if [ $meshidlen -eq 64 ]
-    then
-#      echo "Detecting computer type..."
-      machinetype=$( uname -m )
-      machineid=0
-      if [ $machinetype == 'x86_64' ]
-      then
-#       Linux x86, 64 bit
-        machineid=6
-      fi
-      if [ $machinetype == 'x86' ]
-      then
-#       Linux x86, 32 bit
-        machineid=5
-      fi
-      if [ $machinetype == 'armv6l' ] || [ $machinetype == 'armv7l' ]
-      then
-#       RaspberryPi 1 (armv6l) or RaspberryPi 2/3 (armv7l)
-        machineid=25
-      fi
-# TODO: Add more machine types, detect KVM support, etc.
-      if [ $machineid -eq 0 ]
-      then
-        echo "Unsupported machine type: $machinetype, check with server administrator."
-      else
-        DownloadAgent $url $meshid $machineid
-      fi
-    else
-      echo "MeshID is not correct, must be 64 characters long."
-    fi
-  else
-    echo "URI and/or MeshID have not been specified, must be passed in as arguments."
-    return 0;
-  fi
-}
-
-DownloadAgent() {
-  url=$1
-  meshid=$2
-  machineid=$3
-# Create folder
-  mkdir -p /usr/local/mesh
-  cd /usr/local/mesh
-#  echo "Downloading mesh agent..."
-  wget $url/meshagents?id=$machineid -q --no-check-certificate -O /usr/local/mesh/meshagent
-  if [ $? -eq 0 ]
-  then
-    echo "Mesh agent downloaded."
-# TODO: We could check the meshagent sha256 hash, but best to authenticate the server.
-    chmod 755 /usr/local/mesh/meshagent
-    wget $url/meshsettings?id=$meshid -q --no-check-certificate -O /usr/local/mesh/meshagent.msh
-    if [ $? -eq 0 ]
-    then
-	  UpdateMshFile
-      if [ $starttype -eq 1 ]
-      then
-        echo -e "[Unit]\nDescription=MeshCentral Agent\n[Service]\nExecStart=/usr/local/mesh/meshagent\nStandardOutput=null\nRestart=always\nRestartSec=3\n[Install]\nWantedBy=multi-user.target\nAlias=meshagent.service\n" > /lib/systemd/system/meshagent.service
-        systemctl enable meshagent
-        systemctl start meshagent
-      else
-        ./meshagent start
-        ln -s /usr/local/mesh/meshagent /sbin/meshcmd
-        ln -s /usr/local/mesh/meshagent /etc/rc2.d/S20mesh
-        ln -s /usr/local/mesh/meshagent /etc/rc3.d/S20mesh
-        ln -s /usr/local/mesh/meshagent /etc/rc5.d/S20mesh
-      fi
-	  echo "Mesh agent started."
-    else
-      echo "Unable to download mesh settings at: $url/meshsettings?id=$meshid."
-    fi
-  else
-    echo "Unable to download mesh agent at: $url/meshagents?id=$machineid."
-  fi
-}
-
-UninstallAgent() {
-# Uninstall agent
-  if [ -e "/usr/local" ]
-  then
-    installpath="/usr/local/mesh"
-  else
-    installpath="/usr/mesh"
-  fi
-
-  if [ $starttype -eq 1 ]
-  then
-    rm -f /sbin/meshcmd /lib/systemd/system/meshagent.service
-    systemctl disable meshagent
-    systemctl stop meshagent
-  else
-    rm -f /sbin/meshcmd /etc/rc2.d/S20mesh /etc/rc3.d/S20mesh /etc/rc5.d/S20mesh
-  fi
-
-  if [ -e $installpath ]
-  then
-    cd $installpath
-    if [ -e "$installpath/meshagent" ]
-    then
-      ./meshagent stop
-    fi
-    rm -rf $installpath/*
-    rmdir $installpath
-  fi
-  echo "Agent uninstalled."
-}
-
-
-CheckStartupType
-starttype=$?
-#echo "Type: $starttype"
-
-currentuser=$( whoami )
-if [ $currentuser == 'root' ]
-then
-  if [ $# -eq 0 ]
-  then
-    echo -e "This script will install or uninstall a mesh agent, usage:\n  $0 [serverurl] [meshid]\n  $0 uninstall"
-  else
-    if [ $# -eq 1 ]
-    then
-      if [ $1 == 'uninstall' ] || [ $1 == 'UNINSTALL' ]
-      then
-        UninstallAgent
-      fi
-    else
-      CheckInstallAgent $1 $2
-    fi
-  fi
-else
-  echo "Must be root to install or uninstall mesh agent."
-fi
diff --git a/agents/modules/MyTestModule.js b/agents/modules/MyTestModule.js
deleted file mode 100644
index aa25cabe..00000000
--- a/agents/modules/MyTestModule.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-function MyTestModule()
-{
-    this.getValue = function () { return 1245; };
-}
-
-module.exports = MyTestModule;
\ No newline at end of file
diff --git a/agents/modules/WifiScanner.js b/agents/modules/WifiScanner.js
deleted file mode 100644
index 07e1c173..00000000
--- a/agents/modules/WifiScanner.js
+++ /dev/null
@@ -1,266 +0,0 @@
-var MemoryStream = require('MemoryStream');
-var WindowsWireless = new Buffer([
-0x0A, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x5F, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x77, 0x6C, 0x61, 0x6E,
-0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x45,
-0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x77, 0x6C,
-0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x3D, 0x20,
-0x77, 0x6C, 0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20,
-0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x20, 0x3D, 0x20, 0x77, 0x6C, 0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65,
-0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x35, 0x33, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x61, 0x6D, 0x65, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x31, 0x36, 0x2C, 0x20, 0x35, 0x31, 0x32,
-0x29, 0x2E, 0x41, 0x6E, 0x73, 0x69, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x3B, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x20, 0x28, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61,
-0x6C, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x30, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x4E, 0x4F, 0x54, 0x20, 0x52, 0x45, 0x41, 0x44, 0x59, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x31, 0x3A, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x22, 0x3B, 0x0A,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20,
-0x32, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x44, 0x2D, 0x48, 0x4F, 0x43, 0x22,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73,
-0x65, 0x20, 0x33, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F,
-0x4E, 0x4E, 0x45, 0x43, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x34, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65,
-0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62,
-0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x35, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x53, 0x53, 0x4F, 0x43, 0x49, 0x41, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x36, 0x3A, 0x0A, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F, 0x56, 0x45, 0x52, 0x49, 0x4E, 0x47, 0x22, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65,
-0x20, 0x37, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x55, 0x54, 0x48, 0x45, 0x4E,
-0x54, 0x49, 0x43, 0x41, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74,
-0x65, 0x20, 0x3D, 0x20, 0x22, 0x55, 0x4E, 0x4B, 0x4E, 0x4F, 0x57, 0x4E, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65,
-0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E,
-0x57, 0x6C, 0x61, 0x6E, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20,
-0x30, 0x2C, 0x20, 0x30, 0x29, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E,
-0x20, 0x28, 0x74, 0x72, 0x75, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6C, 0x73, 0x65, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x66, 0x61, 0x6C, 0x73, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x7D, 0x0A, 0x0A, 0x66,
-0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x5F, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x5F, 0x62, 0x73, 0x73, 0x69,
-0x64, 0x2C, 0x20, 0x5F, 0x72, 0x73, 0x73, 0x69, 0x2C, 0x20, 0x5F, 0x6C, 0x71, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D,
-0x20, 0x5F, 0x73, 0x73, 0x69, 0x64, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x5F, 0x62, 0x73, 0x73, 0x69, 0x64, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x72, 0x73, 0x73, 0x69, 0x20, 0x3D, 0x20, 0x5F, 0x72, 0x73, 0x73, 0x69, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73,
-0x2E, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x5F, 0x6C, 0x71, 0x3B, 0x0A, 0x7D, 0x0A, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x2E, 0x70, 0x72, 0x6F, 0x74, 0x6F, 0x74, 0x79,
-0x70, 0x65, 0x2E, 0x74, 0x6F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x20, 0x3D, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x72,
-0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x73, 0x73, 0x69, 0x64, 0x20, 0x2B, 0x20, 0x22, 0x20, 0x5B, 0x22, 0x20, 0x2B, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x62,
-0x73, 0x73, 0x69, 0x64, 0x20, 0x2B, 0x20, 0x22, 0x5D, 0x3A, 0x20, 0x22, 0x20, 0x2B, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x6C, 0x71, 0x29, 0x3B, 0x0A, 0x7D, 0x0A, 0x0A, 0x66, 0x75, 0x6E, 0x63,
-0x74, 0x69, 0x6F, 0x6E, 0x20, 0x4F, 0x6E, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x79, 0x28, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x29, 0x0A,
-0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3D, 0x20, 0x4E,
-0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x43, 0x6F, 0x64, 0x65, 0x20, 0x3D, 0x20, 0x4E, 0x6F, 0x74, 0x69,
-0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x64, 0x61, 0x74, 0x61, 0x47, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74,
-0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x28, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69,
-0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x26, 0x20, 0x30, 0x58, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x38, 0x29, 0x20, 0x26, 0x26, 0x20, 0x28, 0x4E,
-0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x43, 0x6F, 0x64, 0x65, 0x20, 0x3D, 0x3D, 0x20, 0x37, 0x29, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x62, 0x73, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68,
-0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x47, 0x65, 0x74, 0x42,
-0x53, 0x53, 0x4C, 0x69, 0x73, 0x74, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x47,
-0x75, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x33, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x62, 0x73, 0x73, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69,
-0x66, 0x20, 0x28, 0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x74, 0x6F, 0x74, 0x61, 0x6C, 0x53, 0x69, 0x7A, 0x65, 0x20, 0x3D, 0x20, 0x62, 0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28,
-0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76,
-0x61, 0x72, 0x20, 0x6E, 0x75, 0x6D, 0x49, 0x74, 0x65, 0x6D, 0x73, 0x20, 0x3D, 0x20, 0x62, 0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28,
-0x34, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x28, 0x69, 0x20, 0x3D, 0x20,
-0x30, 0x3B, 0x20, 0x69, 0x20, 0x3C, 0x20, 0x6E, 0x75, 0x6D, 0x49, 0x74, 0x65, 0x6D, 0x73, 0x3B, 0x20, 0x2B, 0x2B, 0x69, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x3D, 0x20, 0x62,
-0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x20, 0x2B, 0x20, 0x28, 0x33, 0x36, 0x30, 0x20, 0x2A, 0x20, 0x69, 0x29, 0x2C, 0x20,
-0x33, 0x36, 0x30, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D,
-0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x2C, 0x20, 0x33, 0x32, 0x29, 0x2E, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x2E, 0x74, 0x72, 0x69, 0x6D, 0x28, 0x29,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x74,
-0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x30, 0x2C, 0x20, 0x36, 0x29, 0x2E, 0x48, 0x65, 0x78, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x32, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x73, 0x73, 0x69, 0x20, 0x3D, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65,
-0x66, 0x28, 0x35, 0x36, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-0x72, 0x20, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x36, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x65, 0x6D, 0x69, 0x74, 0x28,
-0x27, 0x53, 0x63, 0x61, 0x6E, 0x27, 0x2C, 0x20, 0x6E, 0x65, 0x77, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x62, 0x73,
-0x73, 0x69, 0x64, 0x2C, 0x20, 0x72, 0x73, 0x73, 0x69, 0x2C, 0x20, 0x6C, 0x71, 0x29, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x7D, 0x0A, 0x0A, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x57, 0x69, 0x72, 0x65,
-0x6C, 0x65, 0x73, 0x73, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x65, 0x6D, 0x69, 0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x20, 0x3D, 0x20,
-0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x65, 0x76, 0x65, 0x6E, 0x74, 0x73, 0x27, 0x29, 0x2E, 0x69, 0x6E, 0x68, 0x65, 0x72, 0x69, 0x74, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x29,
-0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x5F,
-0x47, 0x65, 0x6E, 0x65, 0x72, 0x69, 0x63, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x27, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76,
-0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6F,
-0x78, 0x79, 0x28, 0x22, 0x77, 0x6C, 0x61, 0x6E, 0x61, 0x70, 0x69, 0x2E, 0x64, 0x6C, 0x6C, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69,
-0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x4F, 0x70, 0x65, 0x6E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x22,
-0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28,
-0x22, 0x57, 0x6C, 0x61, 0x6E, 0x47, 0x65, 0x74, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x42, 0x73, 0x73, 0x4C, 0x69, 0x73, 0x74, 0x22, 0x2C, 0x20, 0x22, 0x47, 0x65, 0x74, 0x42, 0x53, 0x53,
-0x4C, 0x69, 0x73, 0x74, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65,
-0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x22, 0x29,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22,
-0x57, 0x6C, 0x61, 0x6E, 0x45, 0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E,
-0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x53, 0x63, 0x61, 0x6E, 0x22, 0x29, 0x3B, 0x0A,
-0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C,
-0x61, 0x6E, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x22, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6E, 0x65, 0x67,
-0x6F, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69,
-0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x68, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C,
-0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69,
-0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x4F, 0x70, 0x65, 0x6E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x28, 0x32, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x6E, 0x65, 0x67, 0x6F, 0x74, 0x69, 0x61, 0x74,
-0x65, 0x64, 0x2C, 0x20, 0x68, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x20, 0x3D, 0x20, 0x68, 0x2E, 0x56, 0x61, 0x6C, 0x3B,
-0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6C, 0x6C, 0x62, 0x61, 0x63, 0x6B, 0x50, 0x72, 0x6F,
-0x78, 0x79, 0x28, 0x4F, 0x6E, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x79, 0x2C, 0x20, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46,
-0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x50, 0x72, 0x65, 0x76, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E,
-0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69,
-0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x58, 0x30, 0x30, 0x30, 0x30, 0x46, 0x46, 0x46, 0x46, 0x2C, 0x20,
-0x30, 0x2C, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x2E, 0x43, 0x61, 0x6C,
-0x6C, 0x62, 0x61, 0x63, 0x6B, 0x2C, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54,
-0x2E, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x50, 0x72, 0x65, 0x76, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6D, 0x69,
-0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x2E, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6E, 0x74, 0x28, 0x27, 0x53, 0x63, 0x61, 0x6E, 0x27, 0x29, 0x3B, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x65, 0x6D, 0x69, 0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x2E, 0x61, 0x64, 0x64, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x27, 0x53, 0x63, 0x61, 0x6E, 0x27,
-0x2C, 0x20, 0x5F, 0x53, 0x63, 0x61, 0x6E, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x47, 0x65, 0x74, 0x43, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x65, 0x64,
-0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x20, 0x3D, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x28, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61,
-0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73,
-0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x45, 0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E,
-0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E,
-0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44,
-0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x35, 0x33, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x61, 0x6D, 0x65, 0x20,
-0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x31, 0x36, 0x2C, 0x20, 0x35, 0x31, 0x32, 0x29, 0x2E, 0x41, 0x6E, 0x73, 0x69, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65,
-0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x28, 0x69, 0x6E,
-0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x20, 0x3D, 0x3D, 0x20, 0x31, 0x29, 0x20, 0x2F, 0x2F,
-0x20, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x76, 0x61, 0x72, 0x20, 0x64, 0x61, 0x74, 0x61, 0x53, 0x69, 0x7A, 0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65,
-0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x70, 0x44,
-0x61, 0x74, 0x61, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72,
-0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x54, 0x79, 0x70, 0x65, 0x20, 0x3D, 0x20,
-0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66,
-0x28, 0x30, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x74, 0x56, 0x61, 0x6C, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65,
-0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x2C, 0x20, 0x37, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x53,
-0x69, 0x7A, 0x65, 0x2C, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2C, 0x20, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x54, 0x79, 0x70, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x72, 0x65, 0x74, 0x56, 0x61, 0x6C, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65,
-0x64, 0x53, 0x53, 0x49, 0x44, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x34, 0x2C,
-0x20, 0x33, 0x32, 0x29, 0x2E, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72,
-0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x36, 0x30,
-0x2C, 0x20, 0x36, 0x29, 0x2E, 0x48, 0x65, 0x78, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x76, 0x61, 0x72, 0x20, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x37, 0x36,
-0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x6E, 0x65, 0x77, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64,
-0x53, 0x53, 0x49, 0x44, 0x2C, 0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x6C, 0x71, 0x29, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x72, 0x6F, 0x77, 0x20, 0x28, 0x22, 0x47, 0x65,
-0x74, 0x43, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x73, 0x3A, 0x20, 0x46, 0x41, 0x49, 0x4C, 0x45, 0x44, 0x20, 0x28, 0x6E, 0x6F, 0x74, 0x20,
-0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x20, 0x6E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x29, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x7D, 0x3B, 0x0A, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x29, 0x3B, 0x0A, 0x7D, 0x0A, 0x0A, 0x6D, 0x6F, 0x64, 0x75, 0x6C,
-0x65, 0x2E, 0x65, 0x78, 0x70, 0x6F, 0x72, 0x74, 0x73, 0x20, 0x3D, 0x20, 0x6E, 0x65, 0x77, 0x20, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x28, 0x29, 0x3B, 0x0A]);
-
-
-
-var WindowsChildScript = new Buffer([
-0x76, 0x61, 0x72, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x43, 0x6F, 0x6E, 0x74,
-0x61, 0x69, 0x6E, 0x65, 0x72, 0x27, 0x29, 0x3B, 0x0D, 0x0A, 0x76, 0x61, 0x72, 0x20, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
-0x28, 0x27, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x27, 0x29, 0x3B, 0x0D, 0x0A, 0x0D, 0x0A, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x2E, 0x6F, 0x6E, 0x28, 0x27, 0x53, 0x63,
-0x61, 0x6E, 0x27, 0x2C, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x28, 0x61, 0x70, 0x29, 0x20, 0x7B, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x73, 0x65, 0x6E, 0x64,
-0x28, 0x61, 0x70, 0x29, 0x3B, 0x20, 0x7D, 0x29, 0x3B, 0x0D, 0x0A, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x2E, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x29, 0x3B, 0x0D, 0x0A]);
-
-
-function AccessPoint(_ssid, _bssid, _lq)
-{
-    this.ssid = _ssid;
-    this.bssid = _bssid;
-    this.lq = _lq;
-}
-AccessPoint.prototype.toString = function ()
-{
-    return (this.ssid + " [" + this.bssid + "]: " + this.lq);
-}
-
-function WiFiScanner()
-{
-    var emitterUtils = require('events').inherits(this);
-    emitterUtils.createEvent('accessPoint');
-
-    this.hasWireless = function ()
-    {
-        var retVal = false;
-        var interfaces = require('os').networkInterfaces();
-        for (var name in interfaces)
-        {
-            if (interfaces[name][0].type == 'wireless') { retVal = true; break; }
-        }
-        return (retVal);
-    };
-
-    this.Scan = function ()
-    {
-        if (process.platform == 'win32')
-        {
-            this.master = require('ScriptContainer').Create(15, ContainerPermissions.DEFAULT);
-            this.master.parent = this;
-            this.master.on('data', function (j) { this.parent.emit('accessPoint', new AccessPoint(j.ssid, j.bssid, j.lq)); });
-
-            this.master.addModule('Wireless', WindowsWireless.toString());
-            this.master.ExecuteString(WindowsChildScript.toString());
-        }
-        else if (process.platform == 'linux')
-        {
-            // Need to get the wireless interface name
-            var interfaces = require('os').networkInterfaces();
-            var wlan = null;
-            for (var i in interfaces)
-            {
-                if (interfaces[i][0].type == 'wireless')
-                {
-                    wlan = i;
-                    break;
-                }
-            }
-            if (wlan != null)
-            {
-                this.child = require('ILibProcessPipe').CreateProcess("/sbin/iwlist", "iwlist", wlan, "scan");
-                this.child.parent = this;
-                this.child.ms = new MemoryStream();
-                this.child.ms.parent = this.child;
-                this.child.on('data', function (buffer) { this.ms.write(buffer); });
-                this.child.on('end', function () { this.ms.end(); });
-                this.child.ms.on('end', function ()
-                {
-                    var str = this.buffer.toString();
-                    tokens = str.split(' - Address: ');
-                    for (var block in tokens)
-                    {
-                        if (block == 0) continue;
-                        var ln = tokens[block].split('\n');
-                        var _bssid = ln[0];
-                        var _lq;
-                        var _ssid;
-
-                        for (var lnblock in ln)
-                        {
-                            lnblock = ln[lnblock].trim();
-                            lnblock = lnblock.trim();
-                            if (lnblock.startsWith('ESSID:'))
-                            {
-                                _ssid = lnblock.slice(7, lnblock.length - 1);
-                                if (_ssid == '<hidden>') { _ssid = ''; }
-                            }
-                            if (lnblock.startsWith('Signal level='))
-                            {
-                                _lq = lnblock.slice(13,lnblock.length-4);
-                            }
-                        }
-                        this.parent.parent.emit('accessPoint', new AccessPoint(_ssid, _bssid, _lq));
-                    }
-                });
-            }
-        }
-    }
-}
-
-module.exports = WiFiScanner;
-
-
-
-
-
-
-
diff --git a/agents/modules/WifiScanner.jsx b/agents/modules/WifiScanner.jsx
deleted file mode 100644
index 07e1c173..00000000
--- a/agents/modules/WifiScanner.jsx
+++ /dev/null
@@ -1,266 +0,0 @@
-var MemoryStream = require('MemoryStream');
-var WindowsWireless = new Buffer([
-0x0A, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x5F, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x77, 0x6C, 0x61, 0x6E,
-0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x45,
-0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x77, 0x6C,
-0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x3D, 0x20,
-0x77, 0x6C, 0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20,
-0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x20, 0x3D, 0x20, 0x77, 0x6C, 0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65,
-0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x35, 0x33, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x61, 0x6D, 0x65, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x31, 0x36, 0x2C, 0x20, 0x35, 0x31, 0x32,
-0x29, 0x2E, 0x41, 0x6E, 0x73, 0x69, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x3B, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x20, 0x28, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61,
-0x6C, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x30, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x4E, 0x4F, 0x54, 0x20, 0x52, 0x45, 0x41, 0x44, 0x59, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x31, 0x3A, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x22, 0x3B, 0x0A,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20,
-0x32, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x44, 0x2D, 0x48, 0x4F, 0x43, 0x22,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73,
-0x65, 0x20, 0x33, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F,
-0x4E, 0x4E, 0x45, 0x43, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x34, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65,
-0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62,
-0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x35, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x53, 0x53, 0x4F, 0x43, 0x49, 0x41, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x36, 0x3A, 0x0A, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F, 0x56, 0x45, 0x52, 0x49, 0x4E, 0x47, 0x22, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65,
-0x20, 0x37, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x55, 0x54, 0x48, 0x45, 0x4E,
-0x54, 0x49, 0x43, 0x41, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74,
-0x65, 0x20, 0x3D, 0x20, 0x22, 0x55, 0x4E, 0x4B, 0x4E, 0x4F, 0x57, 0x4E, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65,
-0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E,
-0x57, 0x6C, 0x61, 0x6E, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20,
-0x30, 0x2C, 0x20, 0x30, 0x29, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E,
-0x20, 0x28, 0x74, 0x72, 0x75, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6C, 0x73, 0x65, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x66, 0x61, 0x6C, 0x73, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x7D, 0x0A, 0x0A, 0x66,
-0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x5F, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x5F, 0x62, 0x73, 0x73, 0x69,
-0x64, 0x2C, 0x20, 0x5F, 0x72, 0x73, 0x73, 0x69, 0x2C, 0x20, 0x5F, 0x6C, 0x71, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D,
-0x20, 0x5F, 0x73, 0x73, 0x69, 0x64, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x5F, 0x62, 0x73, 0x73, 0x69, 0x64, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x72, 0x73, 0x73, 0x69, 0x20, 0x3D, 0x20, 0x5F, 0x72, 0x73, 0x73, 0x69, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73,
-0x2E, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x5F, 0x6C, 0x71, 0x3B, 0x0A, 0x7D, 0x0A, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x2E, 0x70, 0x72, 0x6F, 0x74, 0x6F, 0x74, 0x79,
-0x70, 0x65, 0x2E, 0x74, 0x6F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x20, 0x3D, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x72,
-0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x73, 0x73, 0x69, 0x64, 0x20, 0x2B, 0x20, 0x22, 0x20, 0x5B, 0x22, 0x20, 0x2B, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x62,
-0x73, 0x73, 0x69, 0x64, 0x20, 0x2B, 0x20, 0x22, 0x5D, 0x3A, 0x20, 0x22, 0x20, 0x2B, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x6C, 0x71, 0x29, 0x3B, 0x0A, 0x7D, 0x0A, 0x0A, 0x66, 0x75, 0x6E, 0x63,
-0x74, 0x69, 0x6F, 0x6E, 0x20, 0x4F, 0x6E, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x79, 0x28, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x29, 0x0A,
-0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3D, 0x20, 0x4E,
-0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x43, 0x6F, 0x64, 0x65, 0x20, 0x3D, 0x20, 0x4E, 0x6F, 0x74, 0x69,
-0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x64, 0x61, 0x74, 0x61, 0x47, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74,
-0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x28, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69,
-0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x26, 0x20, 0x30, 0x58, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x38, 0x29, 0x20, 0x26, 0x26, 0x20, 0x28, 0x4E,
-0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x43, 0x6F, 0x64, 0x65, 0x20, 0x3D, 0x3D, 0x20, 0x37, 0x29, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x62, 0x73, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68,
-0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x47, 0x65, 0x74, 0x42,
-0x53, 0x53, 0x4C, 0x69, 0x73, 0x74, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x47,
-0x75, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x33, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x62, 0x73, 0x73, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69,
-0x66, 0x20, 0x28, 0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x74, 0x6F, 0x74, 0x61, 0x6C, 0x53, 0x69, 0x7A, 0x65, 0x20, 0x3D, 0x20, 0x62, 0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28,
-0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76,
-0x61, 0x72, 0x20, 0x6E, 0x75, 0x6D, 0x49, 0x74, 0x65, 0x6D, 0x73, 0x20, 0x3D, 0x20, 0x62, 0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28,
-0x34, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x28, 0x69, 0x20, 0x3D, 0x20,
-0x30, 0x3B, 0x20, 0x69, 0x20, 0x3C, 0x20, 0x6E, 0x75, 0x6D, 0x49, 0x74, 0x65, 0x6D, 0x73, 0x3B, 0x20, 0x2B, 0x2B, 0x69, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x3D, 0x20, 0x62,
-0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x20, 0x2B, 0x20, 0x28, 0x33, 0x36, 0x30, 0x20, 0x2A, 0x20, 0x69, 0x29, 0x2C, 0x20,
-0x33, 0x36, 0x30, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D,
-0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x2C, 0x20, 0x33, 0x32, 0x29, 0x2E, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x2E, 0x74, 0x72, 0x69, 0x6D, 0x28, 0x29,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x74,
-0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x30, 0x2C, 0x20, 0x36, 0x29, 0x2E, 0x48, 0x65, 0x78, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x32, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x73, 0x73, 0x69, 0x20, 0x3D, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65,
-0x66, 0x28, 0x35, 0x36, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-0x72, 0x20, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x36, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x65, 0x6D, 0x69, 0x74, 0x28,
-0x27, 0x53, 0x63, 0x61, 0x6E, 0x27, 0x2C, 0x20, 0x6E, 0x65, 0x77, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x62, 0x73,
-0x73, 0x69, 0x64, 0x2C, 0x20, 0x72, 0x73, 0x73, 0x69, 0x2C, 0x20, 0x6C, 0x71, 0x29, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x7D, 0x0A, 0x0A, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x57, 0x69, 0x72, 0x65,
-0x6C, 0x65, 0x73, 0x73, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x65, 0x6D, 0x69, 0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x20, 0x3D, 0x20,
-0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x65, 0x76, 0x65, 0x6E, 0x74, 0x73, 0x27, 0x29, 0x2E, 0x69, 0x6E, 0x68, 0x65, 0x72, 0x69, 0x74, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x29,
-0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x5F,
-0x47, 0x65, 0x6E, 0x65, 0x72, 0x69, 0x63, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x27, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76,
-0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6F,
-0x78, 0x79, 0x28, 0x22, 0x77, 0x6C, 0x61, 0x6E, 0x61, 0x70, 0x69, 0x2E, 0x64, 0x6C, 0x6C, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69,
-0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x4F, 0x70, 0x65, 0x6E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x22,
-0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28,
-0x22, 0x57, 0x6C, 0x61, 0x6E, 0x47, 0x65, 0x74, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x42, 0x73, 0x73, 0x4C, 0x69, 0x73, 0x74, 0x22, 0x2C, 0x20, 0x22, 0x47, 0x65, 0x74, 0x42, 0x53, 0x53,
-0x4C, 0x69, 0x73, 0x74, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65,
-0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x22, 0x29,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22,
-0x57, 0x6C, 0x61, 0x6E, 0x45, 0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E,
-0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x53, 0x63, 0x61, 0x6E, 0x22, 0x29, 0x3B, 0x0A,
-0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C,
-0x61, 0x6E, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x22, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6E, 0x65, 0x67,
-0x6F, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69,
-0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x68, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C,
-0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69,
-0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x4F, 0x70, 0x65, 0x6E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x28, 0x32, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x6E, 0x65, 0x67, 0x6F, 0x74, 0x69, 0x61, 0x74,
-0x65, 0x64, 0x2C, 0x20, 0x68, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x20, 0x3D, 0x20, 0x68, 0x2E, 0x56, 0x61, 0x6C, 0x3B,
-0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6C, 0x6C, 0x62, 0x61, 0x63, 0x6B, 0x50, 0x72, 0x6F,
-0x78, 0x79, 0x28, 0x4F, 0x6E, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x79, 0x2C, 0x20, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46,
-0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x50, 0x72, 0x65, 0x76, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E,
-0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69,
-0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x58, 0x30, 0x30, 0x30, 0x30, 0x46, 0x46, 0x46, 0x46, 0x2C, 0x20,
-0x30, 0x2C, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x2E, 0x43, 0x61, 0x6C,
-0x6C, 0x62, 0x61, 0x63, 0x6B, 0x2C, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54,
-0x2E, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x50, 0x72, 0x65, 0x76, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6D, 0x69,
-0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x2E, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6E, 0x74, 0x28, 0x27, 0x53, 0x63, 0x61, 0x6E, 0x27, 0x29, 0x3B, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x65, 0x6D, 0x69, 0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x2E, 0x61, 0x64, 0x64, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x27, 0x53, 0x63, 0x61, 0x6E, 0x27,
-0x2C, 0x20, 0x5F, 0x53, 0x63, 0x61, 0x6E, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x47, 0x65, 0x74, 0x43, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x65, 0x64,
-0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x20, 0x3D, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x28, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61,
-0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73,
-0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x45, 0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E,
-0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E,
-0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44,
-0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x35, 0x33, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x61, 0x6D, 0x65, 0x20,
-0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x31, 0x36, 0x2C, 0x20, 0x35, 0x31, 0x32, 0x29, 0x2E, 0x41, 0x6E, 0x73, 0x69, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65,
-0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x28, 0x69, 0x6E,
-0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x20, 0x3D, 0x3D, 0x20, 0x31, 0x29, 0x20, 0x2F, 0x2F,
-0x20, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x76, 0x61, 0x72, 0x20, 0x64, 0x61, 0x74, 0x61, 0x53, 0x69, 0x7A, 0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65,
-0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x70, 0x44,
-0x61, 0x74, 0x61, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72,
-0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x54, 0x79, 0x70, 0x65, 0x20, 0x3D, 0x20,
-0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66,
-0x28, 0x30, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x74, 0x56, 0x61, 0x6C, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65,
-0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x2C, 0x20, 0x37, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x53,
-0x69, 0x7A, 0x65, 0x2C, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2C, 0x20, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x54, 0x79, 0x70, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x72, 0x65, 0x74, 0x56, 0x61, 0x6C, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65,
-0x64, 0x53, 0x53, 0x49, 0x44, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x34, 0x2C,
-0x20, 0x33, 0x32, 0x29, 0x2E, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72,
-0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x36, 0x30,
-0x2C, 0x20, 0x36, 0x29, 0x2E, 0x48, 0x65, 0x78, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x76, 0x61, 0x72, 0x20, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x37, 0x36,
-0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x6E, 0x65, 0x77, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64,
-0x53, 0x53, 0x49, 0x44, 0x2C, 0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x6C, 0x71, 0x29, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x72, 0x6F, 0x77, 0x20, 0x28, 0x22, 0x47, 0x65,
-0x74, 0x43, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x73, 0x3A, 0x20, 0x46, 0x41, 0x49, 0x4C, 0x45, 0x44, 0x20, 0x28, 0x6E, 0x6F, 0x74, 0x20,
-0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x20, 0x6E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x29, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x7D, 0x3B, 0x0A, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x29, 0x3B, 0x0A, 0x7D, 0x0A, 0x0A, 0x6D, 0x6F, 0x64, 0x75, 0x6C,
-0x65, 0x2E, 0x65, 0x78, 0x70, 0x6F, 0x72, 0x74, 0x73, 0x20, 0x3D, 0x20, 0x6E, 0x65, 0x77, 0x20, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x28, 0x29, 0x3B, 0x0A]);
-
-
-
-var WindowsChildScript = new Buffer([
-0x76, 0x61, 0x72, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x43, 0x6F, 0x6E, 0x74,
-0x61, 0x69, 0x6E, 0x65, 0x72, 0x27, 0x29, 0x3B, 0x0D, 0x0A, 0x76, 0x61, 0x72, 0x20, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
-0x28, 0x27, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x27, 0x29, 0x3B, 0x0D, 0x0A, 0x0D, 0x0A, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x2E, 0x6F, 0x6E, 0x28, 0x27, 0x53, 0x63,
-0x61, 0x6E, 0x27, 0x2C, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x28, 0x61, 0x70, 0x29, 0x20, 0x7B, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x73, 0x65, 0x6E, 0x64,
-0x28, 0x61, 0x70, 0x29, 0x3B, 0x20, 0x7D, 0x29, 0x3B, 0x0D, 0x0A, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x2E, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x29, 0x3B, 0x0D, 0x0A]);
-
-
-function AccessPoint(_ssid, _bssid, _lq)
-{
-    this.ssid = _ssid;
-    this.bssid = _bssid;
-    this.lq = _lq;
-}
-AccessPoint.prototype.toString = function ()
-{
-    return (this.ssid + " [" + this.bssid + "]: " + this.lq);
-}
-
-function WiFiScanner()
-{
-    var emitterUtils = require('events').inherits(this);
-    emitterUtils.createEvent('accessPoint');
-
-    this.hasWireless = function ()
-    {
-        var retVal = false;
-        var interfaces = require('os').networkInterfaces();
-        for (var name in interfaces)
-        {
-            if (interfaces[name][0].type == 'wireless') { retVal = true; break; }
-        }
-        return (retVal);
-    };
-
-    this.Scan = function ()
-    {
-        if (process.platform == 'win32')
-        {
-            this.master = require('ScriptContainer').Create(15, ContainerPermissions.DEFAULT);
-            this.master.parent = this;
-            this.master.on('data', function (j) { this.parent.emit('accessPoint', new AccessPoint(j.ssid, j.bssid, j.lq)); });
-
-            this.master.addModule('Wireless', WindowsWireless.toString());
-            this.master.ExecuteString(WindowsChildScript.toString());
-        }
-        else if (process.platform == 'linux')
-        {
-            // Need to get the wireless interface name
-            var interfaces = require('os').networkInterfaces();
-            var wlan = null;
-            for (var i in interfaces)
-            {
-                if (interfaces[i][0].type == 'wireless')
-                {
-                    wlan = i;
-                    break;
-                }
-            }
-            if (wlan != null)
-            {
-                this.child = require('ILibProcessPipe').CreateProcess("/sbin/iwlist", "iwlist", wlan, "scan");
-                this.child.parent = this;
-                this.child.ms = new MemoryStream();
-                this.child.ms.parent = this.child;
-                this.child.on('data', function (buffer) { this.ms.write(buffer); });
-                this.child.on('end', function () { this.ms.end(); });
-                this.child.ms.on('end', function ()
-                {
-                    var str = this.buffer.toString();
-                    tokens = str.split(' - Address: ');
-                    for (var block in tokens)
-                    {
-                        if (block == 0) continue;
-                        var ln = tokens[block].split('\n');
-                        var _bssid = ln[0];
-                        var _lq;
-                        var _ssid;
-
-                        for (var lnblock in ln)
-                        {
-                            lnblock = ln[lnblock].trim();
-                            lnblock = lnblock.trim();
-                            if (lnblock.startsWith('ESSID:'))
-                            {
-                                _ssid = lnblock.slice(7, lnblock.length - 1);
-                                if (_ssid == '<hidden>') { _ssid = ''; }
-                            }
-                            if (lnblock.startsWith('Signal level='))
-                            {
-                                _lq = lnblock.slice(13,lnblock.length-4);
-                            }
-                        }
-                        this.parent.parent.emit('accessPoint', new AccessPoint(_ssid, _bssid, _lq));
-                    }
-                });
-            }
-        }
-    }
-}
-
-module.exports = WiFiScanner;
-
-
-
-
-
-
-
diff --git a/agents/modules_meshcmd/amt-0.2.0.js b/agents/modules_meshcmd/amt-0.2.0.js
deleted file mode 100644
index b2bbafcd..00000000
--- a/agents/modules_meshcmd/amt-0.2.0.js
+++ /dev/null
@@ -1,1002 +0,0 @@
-/*
-Copyright 2018 Intel Corporation
-
-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.
-*/
-
-/**
-* @fileoverview Intel(r) AMT Communication StackXX
-* @author Ylian Saint-Hilaire
-* @version v0.2.0b
-*/
-
-/**
- * Construct a AmtStackCreateService object, this ia the main Intel AMT communication stack.
- * @constructor
- */
-function AmtStackCreateService(wsmanStack) {
-    var obj = new Object();
-    obj.wsman = wsmanStack;
-    obj.pfx = ["http://intel.com/wbem/wscim/1/amt-schema/1/", "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/", "http://intel.com/wbem/wscim/1/ips-schema/1/"];
-    obj.PendingEnums = [];
-    obj.PendingBatchOperations = 0;
-    obj.ActiveEnumsCount = 0;
-    obj.MaxActiveEnumsCount = 1; // Maximum number of enumerations that can be done at the same time.
-    obj.onProcessChanged = null;
-    var _MaxProcess = 0;
-    var _LastProcess = 0;
-
-    // Return the number of pending actions
-    obj.GetPendingActions = function () { return (obj.PendingEnums.length * 2) + (obj.ActiveEnumsCount) + obj.wsman.comm.PendingAjax.length + obj.wsman.comm.ActiveAjaxCount + obj.PendingBatchOperations; }
-
-    // Private Method, Update the current processing status, this gives the application an idea of what progress is being done by the WSMAN stack
-    function _up() {
-        var x = obj.GetPendingActions();
-        if (_MaxProcess < x) _MaxProcess = x;
-        if (obj.onProcessChanged != null && _LastProcess != x) {
-            //console.log("Process Old=" + _LastProcess + ", New=" + x + ", PEnums=" + obj.PendingEnums.length + ", AEnums=" + obj.ActiveEnumsCount + ", PAjax=" + obj.wsman.comm.PendingAjax.length + ", AAjax=" + obj.wsman.comm.ActiveAjaxCount + ", PBatch=" + obj.PendingBatchOperations);
-            _LastProcess = x;
-            obj.onProcessChanged(x, _MaxProcess);
-        }
-        if (x == 0) _MaxProcess = 0;
-    }
-
-    // Perform a WSMAN "SUBSCRIBE" operation.
-    obj.Subscribe = function (name, delivery, url, callback, tag, pri, selectors, opaque, user, pass) { obj.wsman.ExecSubscribe(obj.CompleteName(name), delivery, url, function (ws, resuri, response, xstatus) { _up(); callback(obj, name, response, xstatus, tag); }, 0, pri, selectors, opaque, user, pass); _up(); }
-
-    // Perform a WSMAN "UNSUBSCRIBE" operation.
-    obj.UnSubscribe = function (name, callback, tag, pri, selectors) { obj.wsman.ExecUnSubscribe(obj.CompleteName(name), function (ws, resuri, response, xstatus) { _up(); callback(obj, name, response, xstatus, tag); }, 0, pri, selectors); _up(); }
-
-    // Perform a WSMAN "GET" operation.
-    obj.Get = function (name, callback, tag, pri) { obj.wsman.ExecGet(obj.CompleteName(name), function (ws, resuri, response, xstatus) { _up(); callback(obj, name, response, xstatus, tag); }, 0, pri); _up(); }
-
-    // Perform a WSMAN "PUT" operation.
-    obj.Put = function (name, putobj, callback, tag, pri, selectors) { obj.wsman.ExecPut(obj.CompleteName(name), putobj, function (ws, resuri, response, xstatus) { _up(); callback(obj, name, response, xstatus, tag); }, 0, pri, selectors); _up(); }
-	
-    // Perform a WSMAN "CREATE" operation.
-    obj.Create = function (name, putobj, callback, tag, pri) { obj.wsman.ExecCreate(obj.CompleteName(name), putobj, function (ws, resuri, response, xstatus) { _up(); callback(obj, name, response, xstatus, tag); }, 0, pri); _up(); }
-
-    // Perform a WSMAN "DELETE" operation.
-    obj.Delete = function (name, putobj, callback, tag, pri) { obj.wsman.ExecDelete(obj.CompleteName(name), putobj, function (ws, resuri, response, xstatus) { _up(); callback(obj, name, response, xstatus, tag); }, 0, pri); _up(); }
-
-    // Perform a WSMAN method call operation.
-    obj.Exec = function (name, method, args, callback, tag, pri, selectors) { obj.wsman.ExecMethod(obj.CompleteName(name), method, args, function (ws, resuri, response, xstatus) { _up(); callback(obj, name, obj.CompleteExecResponse(response), xstatus, tag); }, 0, pri, selectors); _up(); }
-	
-    // Perform a WSMAN method call operation.
-    obj.ExecWithXml = function (name, method, args, callback, tag, pri, selectors) { obj.wsman.ExecMethodXml(obj.CompleteName(name), method, execArgumentsToXml(args), function (ws, resuri, response, xstatus) { _up(); callback(obj, name, obj.CompleteExecResponse(response), xstatus, tag); }, 0, pri, selectors); _up(); }
-	
-    // Perform a WSMAN "ENUMERATE" operation.
-    obj.Enum = function (name, callback, tag, pri) {
-        if (obj.ActiveEnumsCount < obj.MaxActiveEnumsCount) {
-            obj.ActiveEnumsCount++; obj.wsman.ExecEnum(obj.CompleteName(name), function (ws, resuri, response, xstatus, tag0) { _up(); _EnumStartSink(name, response, callback, resuri, xstatus, tag0); }, tag, pri);
-        } else {
-            obj.PendingEnums.push([name, callback, tag, pri]);
-        }
-        _up();
-    }
-
-    // Private method
-    function _EnumStartSink(name, response, callback, resuri, status, tag, pri) {
-        if (status != 200) { callback(obj, name, null, status, tag); _EnumDoNext(1); return; }
-        if (response == null || response.Header["Method"] != "EnumerateResponse" || !response.Body["EnumerationContext"]) { callback(obj, name, null, 603, tag); _EnumDoNext(1); return; }
-        var enumctx = response.Body["EnumerationContext"];
-        obj.wsman.ExecPull(resuri, enumctx, function (ws, resuri, response, xstatus) { _EnumContinueSink(name, response, callback, resuri, [], xstatus, tag, pri); });
-    }
-
-    // Private method
-    function _EnumContinueSink(name, response, callback, resuri, items, status, tag, pri) {
-        if (status != 200) { callback(obj, name, null, status, tag); _EnumDoNext(1); return; }
-        if (response == null || response.Header["Method"] != "PullResponse") { callback(obj, name, null, 604, tag); _EnumDoNext(1); return; }
-        for (var i in response.Body["Items"]) {
-            if (response.Body["Items"][i] instanceof Array) {
-                for (var j in response.Body["Items"][i]) { items.push(response.Body["Items"][i][j]); }
-            } else {
-                items.push(response.Body["Items"][i]);
-            }
-        }
-        if (response.Body["EnumerationContext"]) {
-            var enumctx = response.Body["EnumerationContext"];
-            obj.wsman.ExecPull(resuri, enumctx, function (ws, resuri, response, xstatus) { _EnumContinueSink(name, response, callback, resuri, items, xstatus, tag, 1); });
-        } else {
-            _EnumDoNext(1);
-            callback(obj, name, items, status, tag);
-            _up();
-        }
-    }
-
-    // Private method
-    function _EnumDoNext(dec) {
-        obj.ActiveEnumsCount -= dec;
-        if (obj.ActiveEnumsCount >= obj.MaxActiveEnumsCount || obj.PendingEnums.length == 0) return;
-        var x = obj.PendingEnums.shift();
-        obj.Enum(x[0], x[1], x[2]);
-        _EnumDoNext(0);
-    }
-
-    // Perform a batch of WSMAN "ENUM" operations.
-    obj.BatchEnum = function (batchname, names, callback, tag, continueOnError, pri) {
-        obj.PendingBatchOperations += (names.length * 2);
-        _BatchNextEnum(batchname, Clone(names), callback, tag, {}, continueOnError, pri); _up();
-    }
-
-    function Clone(v) { return JSON.parse(JSON.stringify(v)); }
-
-    // Request each enum in the batch, stopping if something does not return status 200
-    function _BatchNextEnum(batchname, names, callback, tag, results, continueOnError, pri) {
-        obj.PendingBatchOperations -= 2;
-        var n = names.shift(), f = obj.Enum;
-        if (n[0] == '*') { f = obj.Get; n = n.substring(1); } // If the name starts with a star, do a GET instead of an ENUM. This will reduce round trips.
-        //console.log((f == obj.Get?'Get ':'Enum ') + n);
-        // Perform a GET/ENUM action
-        f(n, function (stack, name, responses, status, tag0) {
-            tag0[2][name] = { response: (responses==null?null:responses.Body), responses: responses, status: status };
-            if (tag0[1].length == 0 || status == 401 || (continueOnError != true && status != 200 && status != 400)) { obj.PendingBatchOperations -= (names.length * 2); _up(); callback(obj, batchname, tag0[2], status, tag); }
-            else { _up(); _BatchNextEnum(batchname, names, callback, tag, tag0[2], pri); }
-        }, [batchname, names, results], pri);
-        _up();
-    }
-
-    // Perform a batch of WSMAN "GET" operations.
-    obj.BatchGet = function (batchname, names, callback, tag, pri) {
-        _FetchNext({ name: batchname, names: names, callback: callback, current: 0, responses: {}, tag: tag, pri: pri }); _up();
-    }
-
-    // Private method
-    function _FetchNext(batch) {
-        if (batch.names.length <= batch.current) {
-            batch.callback(obj, batch.name, batch.responses, 200, batch.tag);
-        } else {
-            obj.wsman.ExecGet(obj.CompleteName(batch.names[batch.current]), function (ws, resuri, response, xstatus) { _Fetched(batch, response, xstatus); }, batch.pri);
-            batch.current++;
-        }
-        _up();
-    }
-
-    // Private method
-    function _Fetched(batch, response, status) {
-        if (response == null || status != 200) {
-            batch.callback(obj, batch.name, null, status, batch.tag);
-        } else {
-            batch.responses[response.Header["Method"]] = response;
-            _FetchNext(batch);
-        }
-    }
-
-    // Private method
-    obj.CompleteName = function(name) {
-        if (name.indexOf("AMT_") == 0) return obj.pfx[0] + name;
-        if (name.indexOf("CIM_") == 0) return obj.pfx[1] + name;
-        if (name.indexOf("IPS_") == 0) return obj.pfx[2] + name;
-    }
-
-    obj.CompleteExecResponse = function (resp) {
-        if (resp && resp != null && resp.Body && (resp.Body["ReturnValue"] != undefined)) { resp.Body.ReturnValueStr = obj.AmtStatusToStr(resp.Body["ReturnValue"]); }
-        return resp;
-    }
-
-    obj.RequestPowerStateChange = function (PowerState, callback_func) {
-        obj.CIM_PowerManagementService_RequestPowerStateChange(PowerState, "<Address xmlns=\"http://schemas.xmlsoap.org/ws/2004/08/addressing\">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns=\"http://schemas.xmlsoap.org/ws/2004/08/addressing\"><ResourceURI xmlns=\"http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd\">http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ComputerSystem</ResourceURI><SelectorSet xmlns=\"http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd\"><Selector Name=\"CreationClassName\">CIM_ComputerSystem</Selector><Selector Name=\"Name\">ManagedSystem</Selector></SelectorSet></ReferenceParameters>", null, null, callback_func);
-    }
-
-    obj.SetBootConfigRole = function (Role, callback_func) {
-        obj.CIM_BootService_SetBootConfigRole("<Address xmlns=\"http://schemas.xmlsoap.org/ws/2004/08/addressing\">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns=\"http://schemas.xmlsoap.org/ws/2004/08/addressing\"><ResourceURI xmlns=\"http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd\">http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_BootConfigSetting</ResourceURI><SelectorSet xmlns=\"http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd\"><Selector Name=\"InstanceID\">Intel(r) AMT: Boot Configuration 0</Selector></SelectorSet></ReferenceParameters>", Role, callback_func);
-    }
-
-    // Cancel all pending queries with given status
-    obj.CancelAllQueries = function (s) {
-        obj.wsman.CancelAllQueries(s);
-    }
-
-    // Auto generated methods
-    obj.AMT_AgentPresenceWatchdog_RegisterAgent = function (callback_func) { obj.Exec("AMT_AgentPresenceWatchdog", "RegisterAgent", {}, callback_func); }
-    obj.AMT_AgentPresenceWatchdog_AssertPresence = function (SequenceNumber, callback_func) { obj.Exec("AMT_AgentPresenceWatchdog", "AssertPresence", { "SequenceNumber": SequenceNumber }, callback_func); }
-    obj.AMT_AgentPresenceWatchdog_AssertShutdown = function (SequenceNumber, callback_func) { obj.Exec("AMT_AgentPresenceWatchdog", "AssertShutdown", { "SequenceNumber": SequenceNumber }, callback_func); }
-    obj.AMT_AgentPresenceWatchdog_AddAction = function (OldState, NewState, EventOnTransition, ActionSd, ActionEac, callback_func, tag, pri, selectors) { obj.Exec("AMT_AgentPresenceWatchdog", "AddAction", { "OldState": OldState, "NewState": NewState, "EventOnTransition": EventOnTransition, "ActionSd": ActionSd, "ActionEac": ActionEac }, callback_func, tag, pri, selectors); }
-    obj.AMT_AgentPresenceWatchdog_DeleteAllActions = function (callback_func, tag, pri, selectors) { obj.Exec("AMT_AgentPresenceWatchdog", "DeleteAllActions", {}, callback_func, tag, pri, selectors); }
-    obj.AMT_AgentPresenceWatchdogAction_GetActionEac = function (callback_func) { obj.Exec("AMT_AgentPresenceWatchdogAction", "GetActionEac", {}, callback_func); }
-    obj.AMT_AgentPresenceWatchdogVA_RegisterAgent = function (callback_func) { obj.Exec("AMT_AgentPresenceWatchdogVA", "RegisterAgent", {}, callback_func); }
-    obj.AMT_AgentPresenceWatchdogVA_AssertPresence = function (SequenceNumber, callback_func) { obj.Exec("AMT_AgentPresenceWatchdogVA", "AssertPresence", { "SequenceNumber": SequenceNumber }, callback_func); }
-    obj.AMT_AgentPresenceWatchdogVA_AssertShutdown = function (SequenceNumber, callback_func) { obj.Exec("AMT_AgentPresenceWatchdogVA", "AssertShutdown", { "SequenceNumber": SequenceNumber }, callback_func); }
-    obj.AMT_AgentPresenceWatchdogVA_AddAction = function (OldState, NewState, EventOnTransition, ActionSd, ActionEac, callback_func) { obj.Exec("AMT_AgentPresenceWatchdogVA", "AddAction", { "OldState": OldState, "NewState": NewState, "EventOnTransition": EventOnTransition, "ActionSd": ActionSd, "ActionEac": ActionEac }, callback_func); }
-    obj.AMT_AgentPresenceWatchdogVA_DeleteAllActions = function (_method_dummy, callback_func) { obj.Exec("AMT_AgentPresenceWatchdogVA", "DeleteAllActions", { "_method_dummy": _method_dummy }, callback_func); }
-    obj.AMT_AuditLog_ClearLog = function (callback_func) { obj.Exec("AMT_AuditLog", "ClearLog", {}, callback_func); }
-    obj.AMT_AuditLog_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("AMT_AuditLog", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.AMT_AuditLog_ReadRecords = function (StartIndex, callback_func, tag) { obj.Exec("AMT_AuditLog", "ReadRecords", { "StartIndex": StartIndex }, callback_func, tag); }
-    obj.AMT_AuditLog_SetAuditLock = function (LockTimeoutInSeconds, Flag, Handle, callback_func) { obj.Exec("AMT_AuditLog", "SetAuditLock", { "LockTimeoutInSeconds": LockTimeoutInSeconds, "Flag": Flag, "Handle": Handle }, callback_func); }
-    obj.AMT_AuditLog_ExportAuditLogSignature = function (SigningMechanism, callback_func) { obj.Exec("AMT_AuditLog", "ExportAuditLogSignature", { "SigningMechanism": SigningMechanism }, callback_func); }
-    obj.AMT_AuditLog_SetSigningKeyMaterial = function (SigningMechanismType, SigningKey, LengthOfCertificates, Certificates, callback_func) { obj.Exec("AMT_AuditLog", "SetSigningKeyMaterial", { "SigningMechanismType": SigningMechanismType, "SigningKey": SigningKey, "LengthOfCertificates": LengthOfCertificates, "Certificates": Certificates }, callback_func); }
-    obj.AMT_AuditPolicyRule_SetAuditPolicy = function (Enable, AuditedAppID, EventID, PolicyType, callback_func) { obj.Exec("AMT_AuditPolicyRule", "SetAuditPolicy", { "Enable": Enable, "AuditedAppID": AuditedAppID, "EventID": EventID, "PolicyType": PolicyType }, callback_func); }
-    obj.AMT_AuditPolicyRule_SetAuditPolicyBulk = function (Enable, AuditedAppID, EventID, PolicyType, callback_func) { obj.Exec("AMT_AuditPolicyRule", "SetAuditPolicyBulk", { "Enable": Enable, "AuditedAppID": AuditedAppID, "EventID": EventID, "PolicyType": PolicyType }, callback_func); }
-    obj.AMT_AuthorizationService_AddUserAclEntryEx = function (DigestUsername, DigestPassword, KerberosUserSid, AccessPermission, Realms, callback_func) { obj.Exec("AMT_AuthorizationService", "AddUserAclEntryEx", { "DigestUsername": DigestUsername, "DigestPassword": DigestPassword, "KerberosUserSid": KerberosUserSid, "AccessPermission": AccessPermission, "Realms": Realms }, callback_func); }
-    obj.AMT_AuthorizationService_EnumerateUserAclEntries = function (StartIndex, callback_func) { obj.Exec("AMT_AuthorizationService", "EnumerateUserAclEntries", { "StartIndex": StartIndex }, callback_func); }
-    obj.AMT_AuthorizationService_GetUserAclEntryEx = function (Handle, callback_func, tag) { obj.Exec("AMT_AuthorizationService", "GetUserAclEntryEx", { "Handle": Handle }, callback_func, tag); }
-    obj.AMT_AuthorizationService_UpdateUserAclEntryEx = function (Handle, DigestUsername, DigestPassword, KerberosUserSid, AccessPermission, Realms, callback_func) { obj.Exec("AMT_AuthorizationService", "UpdateUserAclEntryEx", { "Handle": Handle, "DigestUsername": DigestUsername, "DigestPassword": DigestPassword, "KerberosUserSid": KerberosUserSid, "AccessPermission": AccessPermission, "Realms": Realms }, callback_func); }
-    obj.AMT_AuthorizationService_RemoveUserAclEntry = function (Handle, callback_func) { obj.Exec("AMT_AuthorizationService", "RemoveUserAclEntry", { "Handle": Handle }, callback_func); }
-    obj.AMT_AuthorizationService_SetAdminAclEntryEx = function (Username, DigestPassword, callback_func) { obj.Exec("AMT_AuthorizationService", "SetAdminAclEntryEx", { "Username": Username, "DigestPassword": DigestPassword }, callback_func); }
-    obj.AMT_AuthorizationService_GetAdminAclEntry = function (callback_func) { obj.Exec("AMT_AuthorizationService", "GetAdminAclEntry", {}, callback_func); }
-    obj.AMT_AuthorizationService_GetAdminAclEntryStatus = function (callback_func) { obj.Exec("AMT_AuthorizationService", "GetAdminAclEntryStatus", {}, callback_func); }
-    obj.AMT_AuthorizationService_GetAdminNetAclEntryStatus = function (callback_func) { obj.Exec("AMT_AuthorizationService", "GetAdminNetAclEntryStatus", {}, callback_func); }
-    obj.AMT_AuthorizationService_SetAclEnabledState = function (Handle, Enabled, callback_func, tag) { obj.Exec("AMT_AuthorizationService", "SetAclEnabledState", { "Handle": Handle, "Enabled": Enabled }, callback_func, tag); }
-    obj.AMT_AuthorizationService_GetAclEnabledState = function (Handle, callback_func, tag) { obj.Exec("AMT_AuthorizationService", "GetAclEnabledState", { "Handle": Handle }, callback_func, tag); }
-    obj.AMT_EndpointAccessControlService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("AMT_EndpointAccessControlService", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.AMT_EndpointAccessControlService_GetPosture = function (PostureType, callback_func) { obj.Exec("AMT_EndpointAccessControlService", "GetPosture", { "PostureType": PostureType }, callback_func); }
-    obj.AMT_EndpointAccessControlService_GetPostureHash = function (PostureType, callback_func) { obj.Exec("AMT_EndpointAccessControlService", "GetPostureHash", { "PostureType": PostureType }, callback_func); }
-    obj.AMT_EndpointAccessControlService_UpdatePostureState = function (UpdateType, callback_func) { obj.Exec("AMT_EndpointAccessControlService", "UpdatePostureState", { "UpdateType": UpdateType }, callback_func); }
-    obj.AMT_EndpointAccessControlService_GetEacOptions = function (callback_func) { obj.Exec("AMT_EndpointAccessControlService", "GetEacOptions", {}, callback_func); }
-    obj.AMT_EndpointAccessControlService_SetEacOptions = function (EacVendors, PostureHashAlgorithm, callback_func) { obj.Exec("AMT_EndpointAccessControlService", "SetEacOptions", { "EacVendors": EacVendors, "PostureHashAlgorithm": PostureHashAlgorithm }, callback_func); }
-    obj.AMT_EnvironmentDetectionSettingData_SetSystemDefensePolicy = function (Policy, callback_func) { obj.Exec("AMT_EnvironmentDetectionSettingData", "SetSystemDefensePolicy", { "Policy": Policy }, callback_func); }
-    obj.AMT_EnvironmentDetectionSettingData_EnableVpnRouting = function (Enable, callback_func) { obj.Exec("AMT_EnvironmentDetectionSettingData", "EnableVpnRouting", { "Enable": Enable }, callback_func); }
-    obj.AMT_EthernetPortSettings_SetLinkPreference = function (LinkPreference, Timeout, callback_func) { obj.Exec("AMT_EthernetPortSettings", "SetLinkPreference", { "LinkPreference": LinkPreference, "Timeout": Timeout }, callback_func); }
-    obj.AMT_HeuristicPacketFilterStatistics_ResetSelectedStats = function (SelectedStatistics, callback_func) { obj.Exec("AMT_HeuristicPacketFilterStatistics", "ResetSelectedStats", { "SelectedStatistics": SelectedStatistics }, callback_func); }
-    obj.AMT_KerberosSettingData_GetCredentialCacheState = function (callback_func) { obj.Exec("AMT_KerberosSettingData", "GetCredentialCacheState", {}, callback_func); }
-    obj.AMT_KerberosSettingData_SetCredentialCacheState = function (Enable, callback_func) { obj.Exec("AMT_KerberosSettingData", "SetCredentialCacheState", { "Enable": Enable }, callback_func); }
-    obj.AMT_MessageLog_CancelIteration = function (IterationIdentifier, callback_func) { obj.Exec("AMT_MessageLog", "CancelIteration", { "IterationIdentifier": IterationIdentifier }, callback_func); }
-    obj.AMT_MessageLog_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("AMT_MessageLog", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.AMT_MessageLog_ClearLog = function (callback_func) { obj.Exec("AMT_MessageLog", "ClearLog", { }, callback_func); }
-    obj.AMT_MessageLog_GetRecords = function (IterationIdentifier, MaxReadRecords, callback_func, tag) { obj.Exec("AMT_MessageLog", "GetRecords", { "IterationIdentifier": IterationIdentifier, "MaxReadRecords": MaxReadRecords }, callback_func, tag); }
-    obj.AMT_MessageLog_GetRecord = function (IterationIdentifier, PositionToNext, callback_func) { obj.Exec("AMT_MessageLog", "GetRecord", { "IterationIdentifier": IterationIdentifier, "PositionToNext": PositionToNext }, callback_func); }
-    obj.AMT_MessageLog_PositionAtRecord = function (IterationIdentifier, MoveAbsolute, RecordNumber, callback_func) { obj.Exec("AMT_MessageLog", "PositionAtRecord", { "IterationIdentifier": IterationIdentifier, "MoveAbsolute": MoveAbsolute, "RecordNumber": RecordNumber }, callback_func); }
-    obj.AMT_MessageLog_PositionToFirstRecord = function (callback_func, tag) { obj.Exec("AMT_MessageLog", "PositionToFirstRecord", {}, callback_func, tag); }
-    obj.AMT_MessageLog_FreezeLog = function (Freeze, callback_func) { obj.Exec("AMT_MessageLog", "FreezeLog", { "Freeze": Freeze }, callback_func); }
-    obj.AMT_PublicKeyManagementService_AddCRL = function (Url, SerialNumbers, callback_func) { obj.Exec("AMT_PublicKeyManagementService", "AddCRL", { "Url": Url, "SerialNumbers": SerialNumbers }, callback_func); }
-    obj.AMT_PublicKeyManagementService_ResetCRLList = function (_method_dummy, callback_func) { obj.Exec("AMT_PublicKeyManagementService", "ResetCRLList", { "_method_dummy": _method_dummy }, callback_func); }
-    obj.AMT_PublicKeyManagementService_AddCertificate = function (CertificateBlob, callback_func) { obj.Exec("AMT_PublicKeyManagementService", "AddCertificate", { "CertificateBlob": CertificateBlob }, callback_func); }
-    obj.AMT_PublicKeyManagementService_AddTrustedRootCertificate = function (CertificateBlob, callback_func) { obj.Exec("AMT_PublicKeyManagementService", "AddTrustedRootCertificate", { "CertificateBlob": CertificateBlob }, callback_func); }
-    obj.AMT_PublicKeyManagementService_AddKey = function (KeyBlob, callback_func) { obj.Exec("AMT_PublicKeyManagementService", "AddKey", { "KeyBlob": KeyBlob }, callback_func); }
-    obj.AMT_PublicKeyManagementService_GeneratePKCS10Request = function (KeyPair, DNName, Usage, callback_func) { obj.Exec("AMT_PublicKeyManagementService", "GeneratePKCS10Request", { "KeyPair": KeyPair, "DNName": DNName, "Usage": Usage }, callback_func); }
-    obj.AMT_PublicKeyManagementService_GeneratePKCS10RequestEx = function (KeyPair, SigningAlgorithm, NullSignedCertificateRequest, callback_func) { obj.Exec("AMT_PublicKeyManagementService", "GeneratePKCS10RequestEx", { "KeyPair": KeyPair, "SigningAlgorithm": SigningAlgorithm, "NullSignedCertificateRequest": NullSignedCertificateRequest }, callback_func); }
-    obj.AMT_PublicKeyManagementService_GenerateKeyPair = function (KeyAlgorithm, KeyLength, callback_func) { obj.Exec("AMT_PublicKeyManagementService", "GenerateKeyPair", { "KeyAlgorithm": KeyAlgorithm, "KeyLength": KeyLength }, callback_func); }
-    obj.AMT_RedirectionService_RequestStateChange = function (RequestedState, callback_func) { obj.Exec("AMT_RedirectionService", "RequestStateChange", { "RequestedState": RequestedState }, callback_func); }
-    obj.AMT_RedirectionService_TerminateSession = function (SessionType, callback_func) { obj.Exec("AMT_RedirectionService", "TerminateSession", { "SessionType": SessionType }, callback_func); }
-    obj.AMT_RemoteAccessService_AddMpServer = function (AccessInfo, InfoFormat, Port, AuthMethod, Certificate, Username, Password, CN, callback_func) { obj.Exec("AMT_RemoteAccessService", "AddMpServer", { "AccessInfo": AccessInfo, "InfoFormat": InfoFormat, "Port": Port, "AuthMethod": AuthMethod, "Certificate": Certificate, "Username": Username, "Password": Password, "CN": CN }, callback_func); }
-    obj.AMT_RemoteAccessService_AddRemoteAccessPolicyRule = function (Trigger, TunnelLifeTime, ExtendedData, MpServer, callback_func) { obj.Exec("AMT_RemoteAccessService", "AddRemoteAccessPolicyRule", { "Trigger": Trigger, "TunnelLifeTime": TunnelLifeTime, "ExtendedData": ExtendedData, "MpServer": MpServer }, callback_func); }
-    obj.AMT_RemoteAccessService_CloseRemoteAccessConnection = function (_method_dummy, callback_func) { obj.Exec("AMT_RemoteAccessService", "CloseRemoteAccessConnection", { "_method_dummy": _method_dummy }, callback_func); }
-    obj.AMT_SetupAndConfigurationService_CommitChanges = function (_method_dummy, callback_func) { obj.Exec("AMT_SetupAndConfigurationService", "CommitChanges", { "_method_dummy": _method_dummy }, callback_func); }
-    obj.AMT_SetupAndConfigurationService_Unprovision = function (ProvisioningMode, callback_func) { obj.Exec("AMT_SetupAndConfigurationService", "Unprovision", { "ProvisioningMode": ProvisioningMode }, callback_func); }
-    obj.AMT_SetupAndConfigurationService_PartialUnprovision = function (_method_dummy, callback_func) { obj.Exec("AMT_SetupAndConfigurationService", "PartialUnprovision", { "_method_dummy": _method_dummy }, callback_func); }
-    obj.AMT_SetupAndConfigurationService_ResetFlashWearOutProtection = function (_method_dummy, callback_func) { obj.Exec("AMT_SetupAndConfigurationService", "ResetFlashWearOutProtection", { "_method_dummy": _method_dummy }, callback_func); }
-    obj.AMT_SetupAndConfigurationService_ExtendProvisioningPeriod = function (Duration, callback_func) { obj.Exec("AMT_SetupAndConfigurationService", "ExtendProvisioningPeriod", { "Duration": Duration }, callback_func); }
-    obj.AMT_SetupAndConfigurationService_SetMEBxPassword = function (Password, callback_func) { obj.Exec("AMT_SetupAndConfigurationService", "SetMEBxPassword", { "Password": Password }, callback_func); }
-    obj.AMT_SetupAndConfigurationService_SetTLSPSK = function (PID, PPS, callback_func) { obj.Exec("AMT_SetupAndConfigurationService", "SetTLSPSK", { "PID": PID, "PPS": PPS }, callback_func); }
-    obj.AMT_SetupAndConfigurationService_GetProvisioningAuditRecord = function (callback_func) { obj.Exec("AMT_SetupAndConfigurationService", "GetProvisioningAuditRecord", {}, callback_func); }
-    obj.AMT_SetupAndConfigurationService_GetUuid = function (callback_func) { obj.Exec("AMT_SetupAndConfigurationService", "GetUuid", {}, callback_func); }
-    obj.AMT_SetupAndConfigurationService_GetUnprovisionBlockingComponents = function (callback_func) { obj.Exec("AMT_SetupAndConfigurationService", "GetUnprovisionBlockingComponents", {}, callback_func); }
-    obj.AMT_SetupAndConfigurationService_GetProvisioningAuditRecordV2 = function (callback_func) { obj.Exec("AMT_SetupAndConfigurationService", "GetProvisioningAuditRecordV2", {}, callback_func); }
-    obj.AMT_SystemDefensePolicy_GetTimeout = function (callback_func) { obj.Exec("AMT_SystemDefensePolicy", "GetTimeout", {}, callback_func); }
-    obj.AMT_SystemDefensePolicy_SetTimeout = function (Timeout, callback_func) { obj.Exec("AMT_SystemDefensePolicy", "SetTimeout", { "Timeout": Timeout }, callback_func); }
-    obj.AMT_SystemDefensePolicy_UpdateStatistics = function (NetworkInterface, ResetOnRead, callback_func, tag, pri, selectors) { obj.Exec("AMT_SystemDefensePolicy", "UpdateStatistics", { "NetworkInterface": NetworkInterface, "ResetOnRead": ResetOnRead }, callback_func, tag, pri, selectors); }
-    obj.AMT_SystemPowerScheme_SetPowerScheme = function (callback_func, schemeInstanceId, tag) { obj.Exec("AMT_SystemPowerScheme", "SetPowerScheme", {}, callback_func, tag, 0, { "InstanceID": schemeInstanceId }); }
-    obj.AMT_TimeSynchronizationService_GetLowAccuracyTimeSynch = function (callback_func, tag) { obj.Exec("AMT_TimeSynchronizationService", "GetLowAccuracyTimeSynch", {}, callback_func, tag); }
-    obj.AMT_TimeSynchronizationService_SetHighAccuracyTimeSynch = function (Ta0, Tm1, Tm2, callback_func, tag) { obj.Exec("AMT_TimeSynchronizationService", "SetHighAccuracyTimeSynch", { "Ta0": Ta0, "Tm1": Tm1, "Tm2": Tm2 }, callback_func, tag); }
-    obj.AMT_UserInitiatedConnectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("AMT_UserInitiatedConnectionService", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.AMT_WebUIService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("AMT_WebUIService", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml("AMT_WiFiPortConfigurationService", "AddWiFiSettings", { "WiFiEndpoint": WiFiEndpoint, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_UpdateWiFiSettings = function (WiFiEndpointSettings, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml("AMT_WiFiPortConfigurationService", "UpdateWiFiSettings", { "WiFiEndpointSettings": WiFiEndpointSettings, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_DeleteAllITProfiles = function (_method_dummy, callback_func) { obj.Exec("AMT_WiFiPortConfigurationService", "DeleteAllITProfiles", { "_method_dummy": _method_dummy }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_DeleteAllUserProfiles = function (_method_dummy, callback_func) { obj.Exec("AMT_WiFiPortConfigurationService", "DeleteAllUserProfiles", { "_method_dummy": _method_dummy }, callback_func); }
-    obj.CIM_Account_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("CIM_Account", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.CIM_AccountManagementService_CreateAccount = function (System, AccountTemplate, callback_func) { obj.Exec("CIM_AccountManagementService", "CreateAccount", { "System": System, "AccountTemplate": AccountTemplate }, callback_func); }
-    obj.CIM_BootConfigSetting_ChangeBootOrder = function (Source, callback_func) { obj.Exec("CIM_BootConfigSetting", "ChangeBootOrder", { "Source": Source }, callback_func); }
-    obj.CIM_BootService_SetBootConfigRole = function (BootConfigSetting, Role, callback_func) { obj.Exec("CIM_BootService", "SetBootConfigRole", { "BootConfigSetting": BootConfigSetting, "Role": Role }, callback_func, 0, 1); }
-    obj.CIM_Card_ConnectorPower = function (Connector, PoweredOn, callback_func) { obj.Exec("CIM_Card", "ConnectorPower", { "Connector": Connector, "PoweredOn": PoweredOn }, callback_func); }
-    obj.CIM_Card_IsCompatible = function (ElementToCheck, callback_func) { obj.Exec("CIM_Card", "IsCompatible", { "ElementToCheck": ElementToCheck }, callback_func); }
-    obj.CIM_Chassis_IsCompatible = function (ElementToCheck, callback_func) { obj.Exec("CIM_Chassis", "IsCompatible", { "ElementToCheck": ElementToCheck }, callback_func); }
-    obj.CIM_Fan_SetSpeed = function (DesiredSpeed, callback_func) { obj.Exec("CIM_Fan", "SetSpeed", { "DesiredSpeed": DesiredSpeed }, callback_func); }
-    obj.CIM_KVMRedirectionSAP_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("CIM_KVMRedirectionSAP", "RequestStateChange", { "RequestedState": RequestedState/*, "TimeoutPeriod": TimeoutPeriod */}, callback_func); }
-    obj.CIM_MediaAccessDevice_LockMedia = function (Lock, callback_func) { obj.Exec("CIM_MediaAccessDevice", "LockMedia", { "Lock": Lock }, callback_func); }
-    obj.CIM_MediaAccessDevice_SetPowerState = function (PowerState, Time, callback_func) { obj.Exec("CIM_MediaAccessDevice", "SetPowerState", { "PowerState": PowerState, "Time": Time }, callback_func); }
-    obj.CIM_MediaAccessDevice_Reset = function (callback_func) { obj.Exec("CIM_MediaAccessDevice", "Reset", {}, callback_func); }
-    obj.CIM_MediaAccessDevice_EnableDevice = function (Enabled, callback_func) { obj.Exec("CIM_MediaAccessDevice", "EnableDevice", { "Enabled": Enabled }, callback_func); }
-    obj.CIM_MediaAccessDevice_OnlineDevice = function (Online, callback_func) { obj.Exec("CIM_MediaAccessDevice", "OnlineDevice", { "Online": Online }, callback_func); }
-    obj.CIM_MediaAccessDevice_QuiesceDevice = function (Quiesce, callback_func) { obj.Exec("CIM_MediaAccessDevice", "QuiesceDevice", { "Quiesce": Quiesce }, callback_func); }
-    obj.CIM_MediaAccessDevice_SaveProperties = function (callback_func) { obj.Exec("CIM_MediaAccessDevice", "SaveProperties", {}, callback_func); }
-    obj.CIM_MediaAccessDevice_RestoreProperties = function (callback_func) { obj.Exec("CIM_MediaAccessDevice", "RestoreProperties", {}, callback_func); }
-    obj.CIM_MediaAccessDevice_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("CIM_MediaAccessDevice", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.CIM_PhysicalFrame_IsCompatible = function (ElementToCheck, callback_func) { obj.Exec("CIM_PhysicalFrame", "IsCompatible", { "ElementToCheck": ElementToCheck }, callback_func); }
-    obj.CIM_PhysicalPackage_IsCompatible = function (ElementToCheck, callback_func) { obj.Exec("CIM_PhysicalPackage", "IsCompatible", { "ElementToCheck": ElementToCheck }, callback_func); }
-    obj.CIM_PowerManagementService_RequestPowerStateChange = function (PowerState, ManagedElement, Time, TimeoutPeriod, callback_func) { obj.Exec("CIM_PowerManagementService", "RequestPowerStateChange", { "PowerState": PowerState, "ManagedElement": ManagedElement, "Time": Time, "TimeoutPeriod": TimeoutPeriod }, callback_func, 0, 1); }
-    obj.CIM_PowerSupply_SetPowerState = function (PowerState, Time, callback_func) { obj.Exec("CIM_PowerSupply", "SetPowerState", { "PowerState": PowerState, "Time": Time }, callback_func); }
-    obj.CIM_PowerSupply_Reset = function (callback_func) { obj.Exec("CIM_PowerSupply", "Reset", {}, callback_func); }
-    obj.CIM_PowerSupply_EnableDevice = function (Enabled, callback_func) { obj.Exec("CIM_PowerSupply", "EnableDevice", { "Enabled": Enabled }, callback_func); }
-    obj.CIM_PowerSupply_OnlineDevice = function (Online, callback_func) { obj.Exec("CIM_PowerSupply", "OnlineDevice", { "Online": Online }, callback_func); }
-    obj.CIM_PowerSupply_QuiesceDevice = function (Quiesce, callback_func) { obj.Exec("CIM_PowerSupply", "QuiesceDevice", { "Quiesce": Quiesce }, callback_func); }
-    obj.CIM_PowerSupply_SaveProperties = function (callback_func) { obj.Exec("CIM_PowerSupply", "SaveProperties", {}, callback_func); }
-    obj.CIM_PowerSupply_RestoreProperties = function (callback_func) { obj.Exec("CIM_PowerSupply", "RestoreProperties", {}, callback_func); }
-    obj.CIM_PowerSupply_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("CIM_PowerSupply", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.CIM_Processor_SetPowerState = function (PowerState, Time, callback_func) { obj.Exec("CIM_Processor", "SetPowerState", { "PowerState": PowerState, "Time": Time }, callback_func); }
-    obj.CIM_Processor_Reset = function (callback_func) { obj.Exec("CIM_Processor", "Reset", {}, callback_func); }
-    obj.CIM_Processor_EnableDevice = function (Enabled, callback_func) { obj.Exec("CIM_Processor", "EnableDevice", { "Enabled": Enabled }, callback_func); }
-    obj.CIM_Processor_OnlineDevice = function (Online, callback_func) { obj.Exec("CIM_Processor", "OnlineDevice", { "Online": Online }, callback_func); }
-    obj.CIM_Processor_QuiesceDevice = function (Quiesce, callback_func) { obj.Exec("CIM_Processor", "QuiesceDevice", { "Quiesce": Quiesce }, callback_func); }
-    obj.CIM_Processor_SaveProperties = function (callback_func) { obj.Exec("CIM_Processor", "SaveProperties", {}, callback_func); }
-    obj.CIM_Processor_RestoreProperties = function (callback_func) { obj.Exec("CIM_Processor", "RestoreProperties", {}, callback_func); }
-    obj.CIM_Processor_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("CIM_Processor", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.CIM_RecordLog_ClearLog = function (callback_func) { obj.Exec("CIM_RecordLog", "ClearLog", {}, callback_func); }
-    obj.CIM_RecordLog_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("CIM_RecordLog", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.CIM_RedirectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("CIM_RedirectionService", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.CIM_Sensor_SetPowerState = function (PowerState, Time, callback_func) { obj.Exec("CIM_Sensor", "SetPowerState", { "PowerState": PowerState, "Time": Time }, callback_func); }
-    obj.CIM_Sensor_Reset = function (callback_func) { obj.Exec("CIM_Sensor", "Reset", {}, callback_func); }
-    obj.CIM_Sensor_EnableDevice = function (Enabled, callback_func) { obj.Exec("CIM_Sensor", "EnableDevice", { "Enabled": Enabled }, callback_func); }
-    obj.CIM_Sensor_OnlineDevice = function (Online, callback_func) { obj.Exec("CIM_Sensor", "OnlineDevice", { "Online": Online }, callback_func); }
-    obj.CIM_Sensor_QuiesceDevice = function (Quiesce, callback_func) { obj.Exec("CIM_Sensor", "QuiesceDevice", { "Quiesce": Quiesce }, callback_func); }
-    obj.CIM_Sensor_SaveProperties = function (callback_func) { obj.Exec("CIM_Sensor", "SaveProperties", {}, callback_func); }
-    obj.CIM_Sensor_RestoreProperties = function (callback_func) { obj.Exec("CIM_Sensor", "RestoreProperties", {}, callback_func); }
-    obj.CIM_Sensor_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("CIM_Sensor", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.CIM_StatisticalData_ResetSelectedStats = function (SelectedStatistics, callback_func) { obj.Exec("CIM_StatisticalData", "ResetSelectedStats", { "SelectedStatistics": SelectedStatistics }, callback_func); }
-    obj.CIM_Watchdog_KeepAlive = function (callback_func) { obj.Exec("CIM_Watchdog", "KeepAlive", {}, callback_func); }
-    obj.CIM_Watchdog_SetPowerState = function (PowerState, Time, callback_func) { obj.Exec("CIM_Watchdog", "SetPowerState", { "PowerState": PowerState, "Time": Time }, callback_func); }
-    obj.CIM_Watchdog_Reset = function (callback_func) { obj.Exec("CIM_Watchdog", "Reset", {}, callback_func); }
-    obj.CIM_Watchdog_EnableDevice = function (Enabled, callback_func) { obj.Exec("CIM_Watchdog", "EnableDevice", { "Enabled": Enabled }, callback_func); }
-    obj.CIM_Watchdog_OnlineDevice = function (Online, callback_func) { obj.Exec("CIM_Watchdog", "OnlineDevice", { "Online": Online }, callback_func); }
-    obj.CIM_Watchdog_QuiesceDevice = function (Quiesce, callback_func) { obj.Exec("CIM_Watchdog", "QuiesceDevice", { "Quiesce": Quiesce }, callback_func); }
-    obj.CIM_Watchdog_SaveProperties = function (callback_func) { obj.Exec("CIM_Watchdog", "SaveProperties", {}, callback_func); }
-    obj.CIM_Watchdog_RestoreProperties = function (callback_func) { obj.Exec("CIM_Watchdog", "RestoreProperties", {}, callback_func); }
-    obj.CIM_Watchdog_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("CIM_Watchdog", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.CIM_WiFiPort_SetPowerState = function (PowerState, Time, callback_func) { obj.Exec("CIM_WiFiPort", "SetPowerState", { "PowerState": PowerState, "Time": Time }, callback_func); }
-    obj.CIM_WiFiPort_Reset = function (callback_func) { obj.Exec("CIM_WiFiPort", "Reset", {}, callback_func); }
-    obj.CIM_WiFiPort_EnableDevice = function (Enabled, callback_func) { obj.Exec("CIM_WiFiPort", "EnableDevice", { "Enabled": Enabled }, callback_func); }
-    obj.CIM_WiFiPort_OnlineDevice = function (Online, callback_func) { obj.Exec("CIM_WiFiPort", "OnlineDevice", { "Online": Online }, callback_func); }
-    obj.CIM_WiFiPort_QuiesceDevice = function (Quiesce, callback_func) { obj.Exec("CIM_WiFiPort", "QuiesceDevice", { "Quiesce": Quiesce }, callback_func); }
-    obj.CIM_WiFiPort_SaveProperties = function (callback_func) { obj.Exec("CIM_WiFiPort", "SaveProperties", {}, callback_func); }
-    obj.CIM_WiFiPort_RestoreProperties = function (callback_func) { obj.Exec("CIM_WiFiPort", "RestoreProperties", {}, callback_func); }
-    obj.CIM_WiFiPort_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("CIM_WiFiPort", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.IPS_HostBasedSetupService_Setup = function (NetAdminPassEncryptionType, NetworkAdminPassword, McNonce, Certificate, SigningAlgorithm, DigitalSignature, callback_func) { obj.Exec("IPS_HostBasedSetupService", "Setup", { "NetAdminPassEncryptionType": NetAdminPassEncryptionType, "NetworkAdminPassword": NetworkAdminPassword, "McNonce": McNonce, "Certificate": Certificate, "SigningAlgorithm": SigningAlgorithm, "DigitalSignature": DigitalSignature }, callback_func); }
-    obj.IPS_HostBasedSetupService_AddNextCertInChain = function (NextCertificate, IsLeafCertificate, IsRootCertificate, callback_func) { obj.Exec("IPS_HostBasedSetupService", "AddNextCertInChain", { "NextCertificate": NextCertificate, "IsLeafCertificate": IsLeafCertificate, "IsRootCertificate": IsRootCertificate }, callback_func); }
-    obj.IPS_HostBasedSetupService_AdminSetup = function (NetAdminPassEncryptionType, NetworkAdminPassword, McNonce, SigningAlgorithm, DigitalSignature, callback_func) { obj.Exec("IPS_HostBasedSetupService", "AdminSetup", { "NetAdminPassEncryptionType": NetAdminPassEncryptionType, "NetworkAdminPassword": NetworkAdminPassword, "McNonce": McNonce, "SigningAlgorithm": SigningAlgorithm, "DigitalSignature": DigitalSignature }, callback_func); }
-    obj.IPS_HostBasedSetupService_UpgradeClientToAdmin = function (McNonce, SigningAlgorithm, DigitalSignature, callback_func) { obj.Exec("IPS_HostBasedSetupService", "UpgradeClientToAdmin", { "McNonce": McNonce, "SigningAlgorithm": SigningAlgorithm, "DigitalSignature": DigitalSignature }, callback_func); }
-    obj.IPS_HostBasedSetupService_DisableClientControlMode = function (_method_dummy, callback_func) { obj.Exec("IPS_HostBasedSetupService", "DisableClientControlMode", { "_method_dummy": _method_dummy }, callback_func); }
-    obj.IPS_KVMRedirectionSettingData_TerminateSession = function (callback_func) { obj.Exec("IPS_KVMRedirectionSettingData", "TerminateSession", {}, callback_func); }
-    obj.IPS_OptInService_StartOptIn = function (callback_func) { obj.Exec("IPS_OptInService", "StartOptIn", {}, callback_func); }
-    obj.IPS_OptInService_CancelOptIn = function (callback_func) { obj.Exec("IPS_OptInService", "CancelOptIn", {}, callback_func); }
-    obj.IPS_OptInService_SendOptInCode = function (OptInCode, callback_func) { obj.Exec("IPS_OptInService", "SendOptInCode", { "OptInCode": OptInCode }, callback_func); }
-    obj.IPS_OptInService_StartService = function (callback_func) { obj.Exec("IPS_OptInService", "StartService", {}, callback_func); }
-    obj.IPS_OptInService_StopService = function (callback_func) { obj.Exec("IPS_OptInService", "StopService", {}, callback_func); }
-    obj.IPS_OptInService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("IPS_OptInService", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.IPS_ProvisioningRecordLog_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("IPS_ProvisioningRecordLog", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-    obj.IPS_ProvisioningRecordLog_ClearLog = function (_method_dummy, callback_func) { obj.Exec("IPS_ProvisioningRecordLog", "ClearLog", { "_method_dummy": _method_dummy }, callback_func); }
-    obj.IPS_SecIOService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec("IPS_SecIOService", "RequestStateChange", { "RequestedState": RequestedState, "TimeoutPeriod": TimeoutPeriod }, callback_func); }
-
-    obj.AmtStatusToStr = function (code) { if (obj.AmtStatusCodes[code]) return obj.AmtStatusCodes[code]; else return "UNKNOWN_ERROR" }
-    obj.AmtStatusCodes = {
-        0x0000: "SUCCESS",
-        0x0001: "INTERNAL_ERROR",
-        0x0002: "NOT_READY",
-        0x0003: "INVALID_PT_MODE",
-        0x0004: "INVALID_MESSAGE_LENGTH",
-        0x0005: "TABLE_FINGERPRINT_NOT_AVAILABLE",
-        0x0006: "INTEGRITY_CHECK_FAILED",
-        0x0007: "UNSUPPORTED_ISVS_VERSION",
-        0x0008: "APPLICATION_NOT_REGISTERED",
-        0x0009: "INVALID_REGISTRATION_DATA",
-        0x000A: "APPLICATION_DOES_NOT_EXIST",
-        0x000B: "NOT_ENOUGH_STORAGE",
-        0x000C: "INVALID_NAME",
-        0x000D: "BLOCK_DOES_NOT_EXIST",
-        0x000E: "INVALID_BYTE_OFFSET",
-        0x000F: "INVALID_BYTE_COUNT",
-        0x0010: "NOT_PERMITTED",
-        0x0011: "NOT_OWNER",
-        0x0012: "BLOCK_LOCKED_BY_OTHER",
-        0x0013: "BLOCK_NOT_LOCKED",
-        0x0014: "INVALID_GROUP_PERMISSIONS",
-        0x0015: "GROUP_DOES_NOT_EXIST",
-        0x0016: "INVALID_MEMBER_COUNT",
-        0x0017: "MAX_LIMIT_REACHED",
-        0x0018: "INVALID_AUTH_TYPE",
-        0x0019: "AUTHENTICATION_FAILED",
-        0x001A: "INVALID_DHCP_MODE",
-        0x001B: "INVALID_IP_ADDRESS",
-        0x001C: "INVALID_DOMAIN_NAME",
-        0x001D: "UNSUPPORTED_VERSION",
-        0x001E: "REQUEST_UNEXPECTED",
-        0x001F: "INVALID_TABLE_TYPE",
-        0x0020: "INVALID_PROVISIONING_STATE",
-        0x0021: "UNSUPPORTED_OBJECT",
-        0x0022: "INVALID_TIME",
-        0x0023: "INVALID_INDEX",
-        0x0024: "INVALID_PARAMETER",
-        0x0025: "INVALID_NETMASK",
-        0x0026: "FLASH_WRITE_LIMIT_EXCEEDED",
-        0x0027: "INVALID_IMAGE_LENGTH",
-        0x0028: "INVALID_IMAGE_SIGNATURE",
-        0x0029: "PROPOSE_ANOTHER_VERSION",
-        0x002A: "INVALID_PID_FORMAT",
-        0x002B: "INVALID_PPS_FORMAT",
-        0x002C: "BIST_COMMAND_BLOCKED",
-        0x002D: "CONNECTION_FAILED",
-        0x002E: "CONNECTION_TOO_MANY",
-        0x002F: "RNG_GENERATION_IN_PROGRESS",
-        0x0030: "RNG_NOT_READY",
-        0x0031: "CERTIFICATE_NOT_READY",
-        0x0400: "DISABLED_BY_POLICY",
-        0x0800: "NETWORK_IF_ERROR_BASE",
-        0x0801: "UNSUPPORTED_OEM_NUMBER",
-        0x0802: "UNSUPPORTED_BOOT_OPTION",
-        0x0803: "INVALID_COMMAND",
-        0x0804: "INVALID_SPECIAL_COMMAND",
-        0x0805: "INVALID_HANDLE",
-        0x0806: "INVALID_PASSWORD",
-        0x0807: "INVALID_REALM",
-        0x0808: "STORAGE_ACL_ENTRY_IN_USE",
-        0x0809: "DATA_MISSING",
-        0x080A: "DUPLICATE",
-        0x080B: "EVENTLOG_FROZEN",
-        0x080C: "PKI_MISSING_KEYS",
-        0x080D: "PKI_GENERATING_KEYS",
-        0x080E: "INVALID_KEY",
-        0x080F: "INVALID_CERT",
-        0x0810: "CERT_KEY_NOT_MATCH",
-        0x0811: "MAX_KERB_DOMAIN_REACHED",
-        0x0812: "UNSUPPORTED",
-        0x0813: "INVALID_PRIORITY",
-        0x0814: "NOT_FOUND",
-        0x0815: "INVALID_CREDENTIALS",
-        0x0816: "INVALID_PASSPHRASE",
-        0x0818: "NO_ASSOCIATION",
-        0x081B: "AUDIT_FAIL",
-        0x081C: "BLOCKING_COMPONENT",
-        0x0821: "USER_CONSENT_REQUIRED",
-        0x1000: "APP_INTERNAL_ERROR",
-        0x1001: "NOT_INITIALIZED",
-        0x1002: "LIB_VERSION_UNSUPPORTED",
-        0x1003: "INVALID_PARAM",
-        0x1004: "RESOURCES",
-        0x1005: "HARDWARE_ACCESS_ERROR",
-        0x1006: "REQUESTOR_NOT_REGISTERED",
-        0x1007: "NETWORK_ERROR",
-        0x1008: "PARAM_BUFFER_TOO_SHORT",
-        0x1009: "COM_NOT_INITIALIZED_IN_THREAD",
-        0x100A: "URL_REQUIRED"
-    }
-
-    //
-    // Methods used for getting the event log
-    //
-
-    obj.GetMessageLog = function (func, tag) {
-        obj.AMT_MessageLog_PositionToFirstRecord(_GetMessageLog0, [func, tag, []]);
-    }
-    function _GetMessageLog0(stack, name, responses, status, tag) {
-        if (status != 200 || responses.Body["ReturnValue"] != '0') { tag[0](obj, null, tag[2], status); return; }
-        obj.AMT_MessageLog_GetRecords(responses.Body["IterationIdentifier"], 390, _GetMessageLog1, tag);
-    }
-    function _GetMessageLog1(stack, name, responses, status, tag) {
-        if (status != 200 || responses.Body["ReturnValue"] != '0') { tag[0](obj, null, tag[2], status); return; }
-        var i, j, x, e, AmtMessages = tag[2], t = new Date(), TimeStamp, ra = responses.Body["RecordArray"];
-        if (typeof ra === 'string') { responses.Body["RecordArray"] = [responses.Body["RecordArray"]]; }
-
-        for (i in ra) {
-            e = Buffer.from(ra[i], 'base64');
-            if (e != null) {
-                TimeStamp = ReadIntX(e, 0);
-                if ((TimeStamp > 0) && (TimeStamp < 0xFFFFFFFF)) {
-                    x = { 'DeviceAddress': e[4], 'EventSensorType': e[5], 'EventType': e[6], 'EventOffset': e[7], 'EventSourceType': e[8], 'EventSeverity': e[9], 'SensorNumber': e[10], 'Entity': e[11], 'EntityInstance': e[12], 'EventData': [], 'Time': new Date((TimeStamp + (t.getTimezoneOffset() * 60)) * 1000) };
-                    for (j = 13; j < 21; j++) { x['EventData'].push(e[j]); }
-                    x['EntityStr'] = _SystemEntityTypes[x['Entity']];
-                    x['Desc'] = _GetEventDetailStr(x['EventSensorType'], x['EventOffset'], x['EventData'], x['Entity']);
-                    if (!x['EntityStr']) x['EntityStr'] = "Unknown";
-                    AmtMessages.push(x);
-                }
-            }
-        }
-
-        if (responses.Body["NoMoreRecords"] != true) { obj.AMT_MessageLog_GetRecords(responses.Body["IterationIdentifier"], 390, _GetMessageLog1, [tag[0], AmtMessages, tag[2]]); } else { tag[0](obj, AmtMessages, tag[2]); }
-    }
-
-    var _EventTrapSourceTypes = "Platform firmware (e.g. BIOS)|SMI handler|ISV system management software|Alert ASIC|IPMI|BIOS vendor|System board set vendor|System integrator|Third party add-in|OSV|NIC|System management card".split('|');
-    var _SystemFirmwareError = "Unspecified.|No system memory is physically installed in the system.|No usable system memory, all installed memory has experienced an unrecoverable failure.|Unrecoverable hard-disk/ATAPI/IDE device failure.|Unrecoverable system-board failure.|Unrecoverable diskette subsystem failure.|Unrecoverable hard-disk controller failure.|Unrecoverable PS/2 or USB keyboard failure.|Removable boot media not found.|Unrecoverable video controller failure.|No video device detected.|Firmware (BIOS) ROM corruption detected.|CPU voltage mismatch (processors that share same supply have mismatched voltage requirements)|CPU speed matching failure".split('|');
-    var _SystemFirmwareProgress = "Unspecified.|Memory initialization.|Starting hard-disk initialization and test|Secondary processor(s) initialization|User authentication|User-initiated system setup|USB resource configuration|PCI resource configuration|Option ROM initialization|Video initialization|Cache initialization|SM Bus initialization|Keyboard controller initialization|Embedded controller/management controller initialization|Docking station attachment|Enabling docking station|Docking station ejection|Disabling docking station|Calling operating system wake-up vector|Starting operating system boot process|Baseboard or motherboard initialization|reserved|Floppy initialization|Keyboard test|Pointing device test|Primary processor initialization".split('|');
-    var _SystemEntityTypes = "Unspecified|Other|Unknown|Processor|Disk|Peripheral|System management module|System board|Memory module|Processor module|Power supply|Add in card|Front panel board|Back panel board|Power system board|Drive backplane|System internal expansion board|Other system board|Processor board|Power unit|Power module|Power management board|Chassis back panel board|System chassis|Sub chassis|Other chassis board|Disk drive bay|Peripheral bay|Device bay|Fan cooling|Cooling unit|Cable interconnect|Memory device|System management software|BIOS|Intel(r) ME|System bus|Group|Intel(r) ME|External environment|Battery|Processing blade|Connectivity switch|Processor/memory module|I/O module|Processor I/O module|Management controller firmware|IPMI channel|PCI bus|PCI express bus|SCSI bus|SATA/SAS bus|Processor front side bus".split('|');
-    obj.RealmNames = "||Redirection|PT Administration|Hardware Asset|Remote Control|Storage|Event Manager|Storage Admin|Agent Presence Local|Agent Presence Remote|Circuit Breaker|Network Time|General Information|Firmware Update|EIT|LocalUN|Endpoint Access Control|Endpoint Access Control Admin|Event Log Reader|Audit Log|ACL Realm|||Local System".split('|');
-    obj.WatchdogCurrentStates = { 1: 'Not Started', 2: 'Stopped', 4: 'Running', 8: 'Expired', 16: 'Suspended' };
-
-    function _GetEventDetailStr(eventSensorType, eventOffset, eventDataField, entity) {
-
-        if (eventSensorType == 15)
-        {
-            if (eventDataField[0] == 235) return "Invalid Data";
-            if (eventOffset == 0) return _SystemFirmwareError[eventDataField[1]];
-            return _SystemFirmwareProgress[eventDataField[1]];
-        }
-
-        if (eventSensorType == 18 && eventDataField[0] == 170) // System watchdog event
-        {
-            return "Agent watchdog " + char2hex(eventDataField[4]) + char2hex(eventDataField[3]) + char2hex(eventDataField[2]) + char2hex(eventDataField[1]) + "-" + char2hex(eventDataField[6]) + char2hex(eventDataField[5]) + "-... changed to " + obj.WatchdogCurrentStates[eventDataField[7]];
-        }
-
-        //if (eventSensorType == 5 && eventOffset == 0) // System chassis
-        //{
-        //    return "Case intrusion";
-        //}
-
-        //if (eventSensorType == 192 && eventOffset == 0 && eventDataField[0] == 170 && eventDataField[1] == 48)
-        //{
-        //    if (eventDataField[2] == 0) return "A remote Serial Over LAN session was established.";
-        //    if (eventDataField[2] == 1) return "Remote Serial Over LAN session finished. User control was restored.";
-        //    if (eventDataField[2] == 2) return "A remote IDE-Redirection session was established.";
-        //    if (eventDataField[2] == 3) return "Remote IDE-Redirection session finished. User control was restored.";
-        //}
-
-        //if (eventSensorType == 36)
-        //{
-        //    long handle = ((long)(eventDataField[1]) << 24) + ((long)(eventDataField[2]) << 16) + ((long)(eventDataField[3]) << 8) + (long)(eventDataField[4]);
-        //    string nic = string.Format("#{0}", eventDataField[0]);
-        //    if (eventDataField[0] == 0xAA) nic = "wired"; // TODO: Add wireless *****
-        //    //if (eventDataField[0] == 0xAA) nic = "wireless";
-
-        //    if (handle == 4294967293) { return string.Format("All received packet filter was matched on {0} interface.", nic); }
-        //    if (handle == 4294967292) { return string.Format("All outbound packet filter was matched on {0} interface.", nic); }
-        //    if (handle == 4294967290) { return string.Format("Spoofed packet filter was matched on {0} interface.", nic); }
-        //    return string.Format("Filter {0} was matched on {1} interface.", handle, nic);
-        //}
-
-        //if (eventSensorType == 192)
-        //{
-        //    if (eventDataField[2] == 0) return "Security policy invoked. Some or all network traffic (TX) was stopped.";
-        //    if (eventDataField[2] == 2) return "Security policy invoked. Some or all network traffic (RX) was stopped.";
-        //    return "Security policy invoked.";
-        //}
-
-        //if (eventSensorType == 193)
-        //{
-        //    if (eventDataField[0] == 0xAA && eventDataField[1] == 0x30 && eventDataField[2] == 0x00 && eventDataField[3] == 0x00) { return "User request for remote connection."; }
-        //    if (eventDataField[0] == 0xAA && eventDataField[1] == 0x20 && eventDataField[2] == 0x03 && eventDataField[3] == 0x01) { return "EAC error: attempt to get posture while NAC in Intel(r) AMT is disabled."; // eventDataField = 0xAA20030100000000 }
-        //    if (eventDataField[0] == 0xAA && eventDataField[1] == 0x20 && eventDataField[2] == 0x04 && eventDataField[3] == 0x00) { return "Certificate revoked. "; }
-        //}
-
-        if (eventSensorType == 6) return "Authentication failed " + (eventDataField[1] + (eventDataField[2] << 8)) + " times. The system may be under attack.";
-        if (eventSensorType == 30) return "No bootable media";
-        if (eventSensorType == 32) return "Operating system lockup or power interrupt";
-        if (eventSensorType == 35) return "System boot failure";
-        if (eventSensorType == 37) return "System firmware started (at least one CPU is properly executing).";
-        return "Unknown Sensor Type #" + eventSensorType;
-    }
-
-// ###BEGIN###{AuditLog}
-
-    // Useful link: https://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/default.htm?turl=WordDocuments%2Fsecurityadminevents.htm
-
-    var _AmtAuditStringTable =
-    {
-        16: 'Security Admin',
-        17: 'RCO',
-        18: 'Redirection Manager',
-        19: 'Firmware Update Manager',
-        20: 'Security Audit Log',
-        21: 'Network Time',
-        22: 'Network Administration',
-        23: 'Storage Administration',
-        24: 'Event Manager',
-        25: 'Circuit Breaker Manager',
-        26: 'Agent Presence Manager',
-        27: 'Wireless Configuration',
-        28: 'EAC',
-        29: 'KVM',
-        30: 'User Opt-In Events',
-        32: 'Screen Blanking',
-        33: 'Watchdog Events',
-        1600: 'Provisioning Started',
-        1601: 'Provisioning Completed',
-        1602: 'ACL Entry Added',
-        1603: 'ACL Entry Modified',
-        1604: 'ACL Entry Removed',
-        1605: 'ACL Access with Invalid Credentials',
-        1606: 'ACL Entry State',
-        1607: 'TLS State Changed',
-        1608: 'TLS Server Certificate Set',
-        1609: 'TLS Server Certificate Remove',
-        1610: 'TLS Trusted Root Certificate Added',
-        1611: 'TLS Trusted Root Certificate Removed',
-        1612: 'TLS Preshared Key Set',
-        1613: 'Kerberos Settings Modified',
-        1614: 'Kerberos Master Key Modified',
-        1615: 'Flash Wear out Counters Reset',
-        1616: 'Power Package Modified',
-        1617: 'Set Realm Authentication Mode',
-        1618: 'Upgrade Client to Admin Control Mode',
-        1619: 'Unprovisioning Started',
-        1700: 'Performed Power Up',
-        1701: 'Performed Power Down',
-        1702: 'Performed Power Cycle',
-        1703: 'Performed Reset',
-        1704: 'Set Boot Options',
-        1800: 'IDER Session Opened',
-        1801: 'IDER Session Closed',
-        1802: 'IDER Enabled',
-        1803: 'IDER Disabled',
-        1804: 'SoL Session Opened',
-        1805: 'SoL Session Closed',
-        1806: 'SoL Enabled',
-        1807: 'SoL Disabled',
-        1808: 'KVM Session Started',
-        1809: 'KVM Session Ended',
-        1810: 'KVM Enabled',
-        1811: 'KVM Disabled',
-        1812: 'VNC Password Failed 3 Times',
-        1900: 'Firmware Updated',
-        1901: 'Firmware Update Failed',
-        2000: 'Security Audit Log Cleared',
-        2001: 'Security Audit Policy Modified',
-        2002: 'Security Audit Log Disabled',
-        2003: 'Security Audit Log Enabled',
-        2004: 'Security Audit Log Exported',
-        2005: 'Security Audit Log Recovered',
-        2100: 'Intel&reg; ME Time Set',
-        2200: 'TCPIP Parameters Set',
-        2201: 'Host Name Set',
-        2202: 'Domain Name Set',
-        2203: 'VLAN Parameters Set',
-        2204: 'Link Policy Set',
-        2205: 'IPv6 Parameters Set',
-        2300: 'Global Storage Attributes Set',
-        2301: 'Storage EACL Modified',
-        2302: 'Storage FPACL Modified',
-        2303: 'Storage Write Operation',
-        2400: 'Alert Subscribed',
-        2401: 'Alert Unsubscribed',
-        2402: 'Event Log Cleared',
-        2403: 'Event Log Frozen',
-        2500: 'CB Filter Added',
-        2501: 'CB Filter Removed',
-        2502: 'CB Policy Added',
-        2503: 'CB Policy Removed',
-        2504: 'CB Default Policy Set',
-        2505: 'CB Heuristics Option Set',
-        2506: 'CB Heuristics State Cleared',
-        2600: 'Agent Watchdog Added',
-        2601: 'Agent Watchdog Removed',
-        2602: 'Agent Watchdog Action Set',
-        2700: 'Wireless Profile Added',
-        2701: 'Wireless Profile Removed',
-        2702: 'Wireless Profile Updated',
-        2800: 'EAC Posture Signer SET',
-        2801: 'EAC Enabled',
-        2802: 'EAC Disabled',
-        2803: 'EAC Posture State',
-        2804: 'EAC Set Options',
-        2900: 'KVM Opt-in Enabled',
-        2901: 'KVM Opt-in Disabled',
-        2902: 'KVM Password Changed',
-        2903: 'KVM Consent Succeeded',
-        2904: 'KVM Consent Failed',
-        3000: 'Opt-In Policy Change',
-        3001: 'Send Consent Code Event',
-        3002: 'Start Opt-In Blocked Event'
-    }
-
-    // Return human readable extended audit log data
-    // TODO: Just put some of them here, but many more still need to be added, helpful link here:
-    // https://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/default.htm?turl=WordDocuments%2Fsecurityadminevents.htm
-    obj.GetAuditLogExtendedDataStr = function (id, data) {
-        if ((id == 1602 || id == 1604) && data[0] == 0) { return data.splice(2, 2 + data[1]).toString(); } // ACL Entry Added/Removed (Digest)
-        if (id == 1603) { if (data[1] == 0) { return data.splice(3).toString(); } return null; } // ACL Entry Modified
-        if (id == 1605) { return ["Invalid ME access", "Invalid MEBx access"][data[0]]; } // ACL Access with Invalid Credentials
-        if (id == 1606) { var r = ["Disabled", "Enabled"][data[0]]; if (data[1] == 0) { r += ", " + data[3]; } return r; } // ACL Entry State
-        if (id == 1607) { return "Remote " + ["NoAuth", "ServerAuth", "MutualAuth"][data[0]] + ", Local " + ["NoAuth", "ServerAuth", "MutualAuth"][data[1]]; } // TLS State Changed
-        if (id == 1617) { return obj.RealmNames[ReadInt(data, 0)] + ", " + ["NoAuth", "Auth", "Disabled"][data[4]]; } // Set Realm Authentication Mode
-        if (id == 1619) { return ["BIOS", "MEBx", "Local MEI", "Local WSMAN", "Remote WSAMN"][data[0]]; } // Intel AMT Unprovisioning Started
-        if (id == 1900) { return "From " + ReadShort(data, 0) + "." + ReadShort(data, 2) + "." + ReadShort(data, 4) + "." + ReadShort(data, 6) + " to " + ReadShort(data, 8) + "." + ReadShort(data, 10) + "." + ReadShort(data, 12) + "." + ReadShort(data, 14); } // Firmware Updated
-        if (id == 2100) { var t4 = new Date(); t4.setTime(ReadInt(data, 0) * 1000 + (new Date().getTimezoneOffset() * 60000)); return t4.toLocaleString(); } // Intel AMT Time Set
-        if (id == 3000) { return "From " + ["None", "KVM", "All"][data[0]] + " to " + ["None", "KVM", "All"][data[1]]; } // Opt-In Policy Change
-        if (id == 3001) { return ["Success", "Failed 3 times"][data[0]]; } // Send Consent Code Event
-        return null;
-    }
-
-    obj.GetAuditLog = function (func) {
-        obj.AMT_AuditLog_ReadRecords(1, _GetAuditLog0, [func, []]);
-    }
-
-    function MakeToArray(v) { if (!v || v == null || typeof v == 'object') return v; return [v]; }
-    function ReadShort(v, p) { return (v[p] << 8) + v[p + 1]; }
-    function ReadInt(v, p) { return (v[p] * 0x1000000) + (v[p + 1] << 16) + (v[p + 2] << 8) + v[p + 3]; } // We use "*0x1000000" instead of "<<24" because the shift converts the number to signed int32.
-    function ReadIntX(v, p) { return (v[p + 3] * 0x1000000) + (v[p + 2] << 16) + (v[p + 1] << 8) + v[p]; }
-    function btoa(x) { return Buffer.from(x).toString('base64'); }
-    function atob(x) { var z = null; try { z = Buffer.from(x, 'base64').toString(); } catch (e) { console.log(e); } return z; }
-
-    function _GetAuditLog0(stack, name, responses, status, tag) {
-        if (status != 200) { tag[0](obj, [], status); return; }
-        var ptr, i, e, es, x, r = tag[1], t = new Date(), TimeStamp;
-
-        if (responses.Body['RecordsReturned'] > 0) {
-            responses.Body['EventRecords'] = MakeToArray(responses.Body['EventRecords']);
-
-            for (i in responses.Body['EventRecords']) {
-                e = null;
-                try {
-                    es = atob(responses.Body['EventRecords'][i]);
-                    e = new Buffer(es);
-                } catch (ex) {
-                    console.log(ex + " " + responses.Body['EventRecords'][i])
-                }
-
-                x = { 'AuditAppID': ReadShort(e, 0), 'EventID': ReadShort(e, 2), 'InitiatorType': e[4] };
-                x['AuditApp'] = _AmtAuditStringTable[x['AuditAppID']];
-                x['Event'] = _AmtAuditStringTable[(x['AuditAppID'] * 100) + x['EventID']];
-                if (!x['Event']) x['Event'] = '#' + x['EventID'];
-
-                // Read and process the initiator
-                if (x['InitiatorType'] == 0) {
-                    // HTTP digest
-                    var userlen = e[5];
-                    x['Initiator'] = e.slice(6, 6 + userlen).toString();
-                    ptr = 6 + userlen;
-                }
-                if (x['InitiatorType'] == 1) {
-                    // Kerberos
-                    x['KerberosUserInDomain'] = ReadInt(e, 5);
-                    var userlen = e[9];
-                    x['Initiator'] = GetSidString(e.slice(10, 10 + userlen));
-                    ptr = 10 + userlen;
-                }
-                if (x['InitiatorType'] == 2) {
-                    // Local
-                    x['Initiator'] = '<i>Local</i>';
-                    ptr = 5;
-                }
-                if (x['InitiatorType'] == 3) {
-                    // KVM Default Port
-                    x['Initiator'] = '<i>KVM Default Port</i>';
-                    ptr = 5;
-                }
-                
-                // Read timestamp
-                TimeStamp = ReadInt(e, ptr);
-                x['Time'] = new Date((TimeStamp + (t.getTimezoneOffset() * 60)) * 1000);
-                ptr += 4;
-                
-                // Read network access
-                x['MCLocationType'] = e[ptr++];
-                var netlen = e[ptr++];
-
-                x['NetAddress'] = e.slice(ptr, ptr + netlen).toString();
-                
-                // Read extended data
-                ptr += netlen;
-                var exlen = e[ptr++];
-                x['Ex'] = e.slice(ptr, ptr + exlen);
-                x['ExStr'] = obj.GetAuditLogExtendedDataStr((x['AuditAppID'] * 100) + x['EventID'], x['Ex']);
-                r.push(x);
-            }
-        }
-        if (responses.Body['TotalRecordCount'] > r.length) {
-            obj.AMT_AuditLog_ReadRecords(r.length + 1, _GetAuditLog0, [tag[0], r]);
-        } else {
-            tag[0](obj, r, status);
-        }
-    }
-
-    // ###END###{AuditLog}
-
-    /*
-    // ###BEGIN###{Certificates}
-
-    // Forge MD5
-    function hex_md5(str) { return forge.md.md5.create().update(str).digest().toHex(); }
-
-    // ###END###{Certificates}
-
-    // ###BEGIN###{!Certificates}
-
-    // TinyMD5 from https://github.com/jbt/js-crypto
-
-    // Perform MD5 setup
-    var md5_k = [];
-    for (var i = 0; i < 64;) { md5_k[i] = 0 | (Math.abs(Math.sin(++i)) * 4294967296); }
-
-    // Perform MD5 on raw string and return hex
-    function hex_md5(str) {
-        var b, c, d, j,
-        x = [],
-        str2 = unescape(encodeURI(str)),
-        a = str2.length,
-        h = [b = 1732584193, c = -271733879, ~b, ~c],
-        i = 0;
-
-        for (; i <= a;) x[i >> 2] |= (str2.charCodeAt(i) || 128) << 8 * (i++ % 4);
-
-        x[str = (a + 8 >> 6) * 16 + 14] = a * 8;
-        i = 0;
-
-        for (; i < str; i += 16) {
-            a = h; j = 0;
-            for (; j < 64;) {
-                a = [
-                  d = a[3],
-                  ((b = a[1] | 0) +
-                    ((d = (
-                      (a[0] +
-                        [
-                          b & (c = a[2]) | ~b & d,
-                          d & b | ~d & c,
-                          b ^ c ^ d,
-                          c ^ (b | ~d)
-                        ][a = j >> 4]
-                      ) +
-                      (md5_k[j] +
-                        (x[[
-                          j,
-                          5 * j + 1,
-                          3 * j + 5,
-                          7 * j
-                        ][a] % 16 + i] | 0)
-                      )
-                    )) << (a = [
-                      7, 12, 17, 22,
-                      5, 9, 14, 20,
-                      4, 11, 16, 23,
-                      6, 10, 15, 21
-                    ][4 * a + j++ % 4]) | d >>> 32 - a)
-                  ),
-                  b,
-                  c
-                ];
-            }
-            for (j = 4; j;) h[--j] = h[j] + a[j];
-        }
-
-        str = '';
-        for (; j < 32;) str += ((h[j >> 3] >> ((1 ^ j++ & 7) * 4)) & 15).toString(16);
-        return str;
-    }
-
-    // ###END###{!Certificates}
-
-    // Perform MD5 on raw string and return raw string result
-    function rstr_md5(str) { return hex2rstr(hex_md5(str)); }
-    */
-    /*
-    Convert arguments into selector set and body XML. Used by AMT_WiFiPortConfigurationService_UpdateWiFiSettings.
-    args = { 
-        "WiFiEndpoint": {
-            __parameterType: 'reference',
-            __resourceUri: 'http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_WiFiEndpoint',
-            Name: 'WiFi Endpoint 0'
-        }, 
-        "WiFiEndpointSettingsInput": 
-        {
-            __parameterType: 'instance',
-            __namespace: 'http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_WiFiEndpointSettings',
-            ElementName: document.querySelector('#editProfile-profileName').value,
-            InstanceID: 'Intel(r) AMT:WiFi Endpoint Settings ' + document.querySelector('#editProfile-profileName').value,
-            AuthenticationMethod: document.querySelector('#editProfile-networkAuthentication').value,
-            //BSSType: 3, // Intel(r) AMT supports only infrastructure networks
-            EncryptionMethod: document.querySelector('#editProfile-encryption').value,
-            SSID: document.querySelector('#editProfile-networkName').value,
-            Priority: 100,
-            PSKPassPhrase: document.querySelector('#editProfile-passPhrase').value
-        }, 
-        "IEEE8021xSettingsInput": null, 
-        "ClientCredential": null, 
-        "CACredential": null 
-    }, 
-    */
-    function execArgumentsToXml(args) {
-        if (args === undefined || args === null) return null;
-
-        var result = '';
-        for (var argName in args) {
-            var arg = args[argName];
-            if (!arg) continue;
-            if (arg['__parameterType'] === 'reference') result += referenceToXml(argName, arg);
-            else result += instanceToXml(argName, arg);
-            //if(arg['__isInstance']) result += instanceToXml(argName, arg);
-        }
-        return result;
-    }
-
-    /**
-     * Convert JavaScript object into XML
-     
-        <r:WiFiEndpointSettingsInput xmlns:q="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_WiFiEndpointSettings">
-            <q:ElementName>Wireless-Profile-Admin</q:ElementName>
-            <q:InstanceID>Intel(r) AMT:WiFi Endpoint Settings Wireless-Profile-Admin</q:InstanceID>
-            <q:AuthenticationMethod>6</q:AuthenticationMethod>
-            <q:EncryptionMethod>4</q:EncryptionMethod>
-            <q:Priority>100</q:Priority>
-            <q:PSKPassPhrase>P@ssw0rd</q:PSKPassPhrase>
-        </r:WiFiEndpointSettingsInput>
-     */
-    function instanceToXml(instanceName, inInstance) {
-        if (inInstance === undefined || inInstance === null) return null;
-
-        var hasNamespace = !!inInstance['__namespace'];
-        var startTag = hasNamespace ? '<q:' : '<';
-        var endTag = hasNamespace ? '</q:' : '</';
-        var namespaceDef = hasNamespace ? (' xmlns:q="' + inInstance['__namespace'] + '"') : '';
-        var result = '<r:' + instanceName + namespaceDef + '>';
-        for (var prop in inInstance) {
-            if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
-
-            if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop])) continue;
-
-            if (typeof inInstance[prop] === 'object') {
-                //result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
-                console.error('only convert one level down...');
-            }
-            else {
-                result += startTag + prop + '>' + inInstance[prop].toString() + endTag + prop + '>';
-            }
-        }
-        result += '</r:' + instanceName + '>';
-        return result;
-    }
-
-
-    /**
-     * Convert a selector set into XML. Expect no nesting.
-     * {
-     * 	selectorName : selectorValue,
-     * 	selectorName : selectorValue,
-     *	... ...
-     * }
-     
-        <r:WiFiEndpoint>
-            <a:Address>http://192.168.1.103:16992/wsman</a:Address>
-            <a:ReferenceParameters>
-                <w:ResourceURI>http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_WiFiEndpoint</w:ResourceURI>
-                <w:SelectorSet>
-                    <w:Selector Name="Name">WiFi Endpoint 0</w:Selector>
-                </w:SelectorSet>
-            </a:ReferenceParameters>
-        </r:WiFiEndpoint>
-                
-     */
-    function referenceToXml(referenceName, inReference) {
-        if (inReference === undefined || inReference === null) return null;
-
-        var result = '<r:' + referenceName + '><a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + inReference['__resourceUri'] + '</w:ResourceURI><w:SelectorSet>';
-        for (var selectorName in inReference) {
-            if (!inReference.hasOwnProperty(selectorName) || selectorName.indexOf('__') === 0) continue;
-
-            if (typeof inReference[selectorName] === 'function' ||
-                typeof inReference[selectorName] === 'object' ||
-                Array.isArray(inReference[selectorName]))
-                continue;
-
-            result += '<w:Selector Name="' + selectorName + '">' + inReference[selectorName].toString() + '</w:Selector>';
-        }
-
-        result += '</w:SelectorSet></a:ReferenceParameters></r:' + referenceName + '>';
-        return result;
-    }
-
-    // Convert a byte array of SID into string
-    function GetSidString(sid) {
-        var r = "S-" + sid.charCodeAt(0) + "-" + sid.charCodeAt(7);
-        for (var i = 2; i < (sid.length / 4) ; i++) r += "-" + ReadIntX(sid, i * 4);
-        return r;
-    }
-
-    // Convert a SID readable string into bytes
-    function GetSidByteArray(sidString) {
-        if (!sidString || sidString == null) return null;
-        var sidParts = sidString.split('-');
-
-        // Make sure the SID has at least 4 parts and starts with 'S'
-        if (sidParts.length < 4 || (sidParts[0] != 's' && sidParts[0] != 'S')) return null;
-
-        // Check that each part of the SID is really an integer
-        for (var i = 1; i < sidParts.length; i++) { var y = parseInt(sidParts[i]); if (y != sidParts[i]) return null; sidParts[i] = y; }
-
-        // Version (8 bit) + Id count (8 bit) + 48 bit in big endian -- DO NOT use bitwise right shift operator. JavaScript converts the number into a 32 bit integer before shifting. In real world, it's highly likely this part is always 0.
-        var r = String.fromCharCode(sidParts[1]) + String.fromCharCode(sidParts.length - 3) + ShortToStr(Math.floor(sidParts[2] / Math.pow(2, 32))) + IntToStr((sidParts[2]) & 0xFFFF);
-
-        // the rest are in 32 bit in little endian
-        for (var i = 3; i < sidParts.length; i++) r += IntToStrX(sidParts[i]);
-        return r;
-    }
-
-    return obj;
-}
-
-module.exports = AmtStackCreateService;
diff --git a/agents/modules_meshcmd/amt-script-0.2.0.js b/agents/modules_meshcmd/amt-script-0.2.0.js
deleted file mode 100644
index 6d5ec6ac..00000000
--- a/agents/modules_meshcmd/amt-script-0.2.0.js
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
-Copyright 2018 Intel Corporation
-
-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.
-*/
-
-/**
-* @fileoverview Script Compiler / Decompiler / Runner
-* @author Ylian Saint-Hilaire
-* @version v0.1.0e
-*/
-
-// Core functions
-script_functionTable1 = ['nop', 'jump', 'set', 'print', 'dialog', 'getitem', 'substr', 'indexof', 'split', 'join', 'length', 'jsonparse', 'jsonstr', 'add', 'substract', 'parseint', 'wsbatchenum', 'wsput', 'wscreate', 'wsdelete', 'wsexec', 'scriptspeed', 'wssubscribe', 'wsunsubscribe', 'readchar', 'signwithdummyca'];
-
-// functions of type ARG1 = func(ARG2, ARG3, ARG4, ARG5, ARG6)
-script_functionTable2 = ['encodeuri', 'decodeuri', 'passwordcheck', 'atob', 'btoa', 'hex2str', 'str2hex', 'random', 'md5', 'maketoarray', 'readshort', 'readshortx', 'readint', 'readsint', 'readintx', 'shorttostr', 'shorttostrx', 'inttostr', 'inttostrx'];
-
-// functions of type ARG1 = func(ARG2, ARG3, ARG4, ARG5, ARG6)
-script_functionTableX2 = [encodeURI, decodeURI, passwordcheck, window.atob.bind(window), window.btoa.bind(window), hex2rstr, rstr2hex, random, rstr_md5, MakeToArray, ReadShort, ReadShortX, ReadInt, ReadSInt, ReadIntX, ShortToStr, ShortToStrX, IntToStr, IntToStrX];
-
-// Optional functions of type ARG1 = func(ARG2, ARG3, ARG4, ARG5, ARG6)
-script_functionTable3 = ['pullsystemstatus', 'pulleventlog', 'pullauditlog', 'pullcertificates', 'pullwatchdog', 'pullsystemdefense', 'pullhardware', 'pulluserinfo', 'pullremoteaccess', 'highlightblock', 'disconnect', 'getsidstring', 'getsidbytearray', 'pulleventsubscriptions'];
-
-// Optional functions of type ARG1 = func(ARG2, ARG3, ARG4, ARG5, ARG6)
-script_functionTableX3 = [
-    PullSystemStatus
-    ,
-    // ###BEGIN###{EventLog}
-    PullEventLog
-    // ###END###{EventLog}
-    ,
-    // ###BEGIN###{AuditLog}
-    PullAuditLog
-    // ###END###{AuditLog}
-    ,
-    // ###BEGIN###{Certificates}
-    PullCertificates
-    // ###END###{Certificates}
-    ,
-    // ###BEGIN###{AgentPresence}
-    PullWatchdog
-    // ###END###{AgentPresence}
-    ,
-    // ###BEGIN###{SystemDefense}
-    PullSystemDefense
-    // ###END###{SystemDefense}
-    ,
-    // ###BEGIN###{HardwareInfo}
-    PullHardware
-    // ###END###{HardwareInfo}
-    ,
-    PullUserInfo
-    ,
-    // ###BEGIN###{RemoteAccess}
-    PullRemoteAccess
-    // ###END###{RemoteAccess}
-    ,
-    // ###BEGIN###{Scripting-Editor}
-    script_HighlightBlock
-    // ###END###{Scripting-Editor}
-    ,
-    // ###BEGIN###{ComputerSelector}
-    disconnect
-    // ###END###{ComputerSelector}
-    ,
-    function (runner, x) { return GetSidString(x); }
-    ,
-    function (runner, x) { return GetSidByteArray(x); }
-    ,
-    // ###BEGIN###{EventSubscriptions}
-    PullEventSubscriptions
-    // ###END###{EventSubscriptions}
-];
-
-// Setup the script state
-function script_setup(binary, startvars) {
-    var obj = { startvars:startvars };
-    if (binary.length < 6) { console.error('Invalid script length'); return null; } // Script must have at least 6 byte header
-    if (ReadInt(binary, 0) != 0x247D2945) { console.error('Invalid binary script'); return null; } // Check the script magic header
-    if (ReadShort(binary, 4) > 1) { console.error('Unsupported script version'); return null; } // Check the script version
-    obj.script = binary.substring(6);
-    // obj.onStep;
-    // obj.onConsole;
-
-    // Reset the script to the start
-    obj.reset = function (stepspeed) {
-        obj.stop();
-        obj.ip = 0;
-        obj.variables = startvars;
-        obj.state = 1;
-    }
-
-    // Start the script
-    obj.start = function (stepspeed) {
-        obj.stop();
-        obj.stepspeed = stepspeed;
-        if (stepspeed > 0) { obj.timer = setInterval(function () { obj.step() }, stepspeed); }
-    }
-
-    // Stop the script
-    obj.stop = function () {
-        if (obj.timer != null) { clearInterval(obj.timer); }
-        obj.timer = null;
-        obj.stepspeed = 0;
-    }
-
-    // function used to load and store variable values
-    obj.getVar = function (name) { if (name == undefined) return undefined; return obj.getVarEx(name.split('.'), obj.variables); }
-    obj.getVarEx = function (name, val) { try { if (name == undefined) return undefined; if (name.length == 0) return val; return obj.getVarEx(name.slice(1), val[name[0]]); } catch (e) { return null; } }
-    obj.setVar = function (name, val) { obj.setVarEx(name.split('.'), obj.variables, val); }
-    obj.setVarEx = function (name, vars, val) { if (name.length == 1) { vars[name[0]] = val; } else { obj.setVarEx(name.slice(1), vars[name[0]], val); } }
-
-    // Run the script one step forward
-    obj.step = function () {
-        if (obj.state != 1) return;
-        if (obj.ip < obj.script.length) {
-            var cmdid = ReadShort(obj.script, obj.ip);
-            var cmdlen = ReadShort(obj.script, obj.ip + 2);
-            var argcount = ReadShort(obj.script, obj.ip + 4);
-            var argptr = obj.ip + 6;
-            var args = [];
-
-            // Clear all temp variables (This is optional)
-            for (var i in obj.variables) { if (i.startsWith('__')) { delete obj.variables[i]; } }
-
-            // Loop on each argument, moving forward by the argument length each time
-            for (var i = 0; i < argcount; i++) {
-                var arglen = ReadShort(obj.script, argptr);
-                var argval = obj.script.substring(argptr + 2, argptr + 2 + arglen);
-                var argtyp = argval.charCodeAt(0);
-                argval = argval.substring(1);
-                if (argtyp < 2) {
-                    // Get the value and replace all {var} with variable values
-                    while (argval.split("{").length > 1) { var t = argval.split("{").pop().split("}").shift(); argval = argval.replace('{' + t + '}', obj.getVar(t)); }
-                    if (argtyp == 1) { obj.variables['__' + i] = decodeURI(argval); argval = '__' + i; } // If argtyp is 1, this is a literal. Store in temp variable.
-                    args.push(argval);
-                }
-                if (argtyp == 2 || argtyp == 3) {
-                    obj.variables['__' + i] = ReadSInt(argval, 0);
-                    args.push('__' + i);
-                }
-                argptr += (2 + arglen);
-            }
-
-            // Move instruction pointer forward by command size
-            obj.ip += cmdlen;
-
-            // Get all variable values
-            var argsval = [];
-            for (var i = 0; i < 10; i++) { argsval.push(obj.getVar(args[i])); }
-            var storeInArg0;
-
-            try {
-                if (cmdid < 10000) {
-                    // Lets run the actual command
-                    switch (cmdid) {
-                        case 0: // nop
-                            break;
-                        case 1: // jump(label) or jump(label, a, compare, b)
-                            if (argsval[2]) {
-                                if (
-                                    (argsval[2] == '<' && argsval[1] < argsval[3]) ||
-                                    (argsval[2] == '<=' && argsval[1] <= argsval[3]) ||
-                                    (argsval[2] == '!=' && argsval[1] != argsval[3]) ||
-                                    (argsval[2] == '=' && argsval[1] == argsval[3]) ||
-                                    (argsval[2] == '>=' && argsval[1] >= argsval[3]) ||
-                                    (argsval[2] == '>' && argsval[1] > argsval[3])
-                                ) { obj.ip = argsval[0]; }
-                            } else {
-                                obj.ip = argsval[0]; // Set the instruction pointer to the new location in the script
-                            }
-                            break;
-                        case 2: // set(variable, value)
-                            if (args[1] == undefined) delete obj.variables[args[0]]; else obj.setVar(args[0], argsval[1]);
-                            break;
-                        case 3: // print(message)
-                            if (obj.onConsole) { obj.onConsole(obj.toString(argsval[0]), obj); } else { console.log(obj.toString(argsval[0])); }
-                            //  Q(obj.consoleid).value += () + '\n'); Q(obj.console).scrollTop = Q(obj.console).scrollHeight;
-                            break;
-                        case 4: // dialog(title, content, buttons)
-                            obj.state = 2;
-                            obj.dialog = true;
-                            setDialogMode(11, argsval[0], argsval[2], obj.xxStepDialogOk, argsval[1], obj);
-                            break;
-                        case 5: // getitem(a, b, c)
-                            for (var i in argsval[1]) { if (argsval[1][i][argsval[2]] == argsval[3]) { storeInArg0 = i; } };
-                            break;
-                        case 6: // substr(variable_dest, variable_src, index, len)
-                            storeInArg0 = argsval[1].substr(argsval[2], argsval[3]);
-                            break;
-                        case 7: // indexOf(variable_dest, variable_src, index, len)
-                            storeInArg0 = argsval[1].indexOf(argsval[2]);
-                            break;
-                        case 8: // split(variable_dest, variable_src, separator)
-                            storeInArg0 = argsval[1].split(argsval[2]);
-                            break;
-                        case 9: // join(variable_dest, variable_src, separator)
-                            storeInArg0 = argsval[1].join(argsval[2]);
-                            break;
-                        case 10: // length(variable_dest, variable_src)
-                            storeInArg0 = argsval[1].length;
-                            break;
-                        case 11: // jsonparse(variable_dest, json)
-                            storeInArg0 = JSON.parse(argsval[1]);
-                            break;
-                        case 12: // jsonstr(variable_dest, variable_src)
-                            storeInArg0 = JSON.stringify(argsval[1]);
-                            break;
-                        case 13: // add(variable_dest, variable_src, value)
-                            storeInArg0 = (argsval[1] + argsval[2]);
-                            break;
-                        case 14: // substract(variable_dest, variable_src, value)
-                            storeInArg0 = (argsval[1] - argsval[2]);
-                            break;
-                        case 15: // parseInt(variable_dest, variable_src)
-                            storeInArg0 = parseInt(argsval[1]);
-                            break;
-                        case 16: // wsbatchenum(name, objectList)
-                            obj.state = 2;
-                            obj.amtstack.BatchEnum(argsval[0], argsval[1], obj.xxWsmanReturn, obj);
-                            break;
-                        case 17: // wsput(name, args)
-                            obj.state = 2;
-                            obj.amtstack.Put(argsval[0], argsval[1], obj.xxWsmanReturn, obj);
-                            break;
-                        case 18: // wscreate(name, args)
-                            obj.state = 2;
-                            obj.amtstack.Create(argsval[0], argsval[1], obj.xxWsmanReturn, obj);
-                            break;
-                        case 19: // wsdelete(name, args)
-                            obj.state = 2;
-                            obj.amtstack.Delete(argsval[0], argsval[1], obj.xxWsmanReturn, obj);
-                            break;
-                        case 20: // wsexec(name, method, args, selectors)
-                            obj.state = 2;
-                            obj.amtstack.Exec(argsval[0], argsval[1], argsval[2], obj.xxWsmanReturn, obj, 0, argsval[3]);
-                            break;
-                        case 21: // Script Speed
-                            obj.stepspeed = argsval[0];
-                            if (obj.timer != null) { clearInterval(obj.timer); obj.timer = setInterval(function () { obj.step() }, obj.stepspeed); }
-                            break;
-                        case 22: // wssubscribe(name, delivery, url, selectors, opaque, user, pass)
-                            obj.state = 2;
-                            obj.amtstack.Subscribe(argsval[0], argsval[1], argsval[2], obj.xxWsmanReturn, obj, 0, argsval[3], argsval[4], argsval[5], argsval[6]);
-                            break;
-                        case 23: // wsunsubscribe(name, selectors)
-                            obj.state = 2;
-                            obj.amtstack.UnSubscribe(argsval[0], obj.xxWsmanReturn, obj, 0, argsval[1]);
-                            break;
-                        case 24: // readchar(str, pos)
-                            console.log(argsval[1], argsval[2], argsval[1].charCodeAt(argsval[2]));
-                            storeInArg0 = argsval[1].charCodeAt(argsval[2]);
-                            break;
-                        case 25: // signWithDummyCa
-                            // ###BEGIN###{Certificates}
-                            obj.state = 2;
-                            // DERKey, xxCaPrivateKey, certattributes, issuerattributes
-                            amtcert_signWithCaKey(argsval[0], null, argsval[1], { 'CN': 'Untrusted Root Certificate' }, obj.xxSignWithDummyCaReturn);
-                            // ###END###{Certificates}
-                            break;
-                        default: {
-                            obj.state = 9;
-                            console.error("Script Error, unknown command: " + cmdid);
-                        }
-                    }
-                } else {
-                    if (cmdid < 20000) {
-                        // functions of type ARG1 = func(ARG2, ARG3, ARG4, ARG5, ARG6)
-                        storeInArg0 = script_functionTableX2[cmdid - 10000](argsval[1], argsval[2], argsval[3], argsval[4], argsval[5], argsval[6]);
-                    } else {
-                        // Optional functions of type ARG1 = func(ARG2, ARG3, ARG4, ARG5, ARG6)
-                        if (script_functionTableX3 && script_functionTableX3[cmdid - 20000]) {
-                            storeInArg0 = script_functionTableX3[cmdid - 20000](obj, argsval[1], argsval[2], argsval[3], argsval[4], argsval[5], argsval[6]); // Note that optional calls start with "obj" as first argument.
-                        }
-                    }
-                }
-
-                if (storeInArg0 != undefined) obj.setVar(args[0], storeInArg0);
-            } catch (e) {
-                if (typeof e == 'object') { e = e.message; }
-                obj.setVar('_exception', e);
-            }
-        }
-
-        if (obj.state == 1 && obj.ip >= obj.script.length) { obj.state = 0; obj.stop(); }
-        if (obj.onStep) obj.onStep(obj);
-        return obj;
-    }
-
-    obj.xxStepDialogOk = function (button) {
-        obj.variables['DialogSelect'] = button;
-        obj.state = 1;
-        obj.dialog = false;
-        if (obj.onStep) obj.onStep(obj);
-    }
-
-    // ###BEGIN###{**ClosureAdvancedMode}
-    obj.xxWsmanReturnFix = function (x) {
-        if (!x || x == null) return;
-        if (x.Header) { x['Header'] = x.Header; delete x.Header; }
-        if (x.Body) { x['Body'] = x.Body; delete x.Body; }
-        if (x.Responses) { x['Responses'] = x.Responses; delete x.Responses; }
-        if (x.Response) { x['Response'] = x.Response; delete x.Response; }
-        if (x.ReturnValueStr) { x['ReturnValueStr'] = x.ReturnValueStr; delete x.ReturnValueStr; }
-    }
-    // ###END###{**ClosureAdvancedMode}
-
-    obj.xxWsmanReturn = function (stack, name, responses, status) {
-        // ###BEGIN###{**ClosureAdvancedMode}
-        // This is required when Google Closure is used
-        if (responses) {
-            obj.xxWsmanReturnFix(responses);
-            for (var i in responses) {
-                obj.xxWsmanReturnFix(responses[i]);
-                for (var j in responses[i]) { obj.xxWsmanReturnFix(responses[i][j]); }
-            }
-        }
-        // ###END###{**ClosureAdvancedMode}
-        obj.setVar(name, responses);
-        obj.setVar('wsman_result', status);
-        obj.setVar('wsman_result_str', ((httpErrorTable[status]) ? (httpErrorTable[status]) : ('Error #' + status)));
-        obj.state = 1;
-        if (obj.onStep) obj.onStep(obj);
-    }
-
-    // ###BEGIN###{Certificates}
-    obj.xxSignWithDummyCaReturn = function (cert) {
-        obj.setVar('signed_cert', btoa(_arrayBufferToString(cert)));
-        obj.state = 1;
-        if (obj.onStep) obj.onStep(obj);
-    }
-    // ###END###{Certificates}
-
-    obj.toString = function (x) { if (typeof x == 'object') return JSON.stringify(x); return x; }
-
-    obj.reset();
-    return obj;
-}
-
-// Argument types: 0 = Variable, 1 = String, 2 = Integer, 3 = Label
-function script_compile(script, onmsg) {
-    var r = '', scriptlines = script.split('\n'), labels = {}, labelswap = [], swaps = [];
-    // Go thru each script line and encode it
-    for (var i in scriptlines) {
-        var scriptline = scriptlines[i];
-        if (scriptline.startsWith('##SWAP ')) { var x = scriptline.split(' '); if (x.length == 3) { swaps[x[1]] = x[2]; } } // Add a swap instance
-        if (scriptline[0] == '#' || scriptline.length == 0) continue; // Skip comments & blank lines
-        for (var x in swaps) { scriptline = scriptline.split(x).join(swaps[x]); } // Apply all swaps
-        var keywords = scriptline.match(/"[^"]*"|[^\s"]+/g);
-        if (keywords.length == 0) continue; // Skip blank lines
-        if (scriptline[0] == ':') { labels[keywords[0].toUpperCase()] = r.length; continue; } // Mark a label position
-        var funcIndex = script_functionTable1.indexOf(keywords[0].toLowerCase());
-        if (funcIndex == -1) { funcIndex = script_functionTable2.indexOf(keywords[0].toLowerCase()); if (funcIndex >= 0) funcIndex += 10000; }
-        if (funcIndex == -1) { funcIndex = script_functionTable3.indexOf(keywords[0].toLowerCase()); if (funcIndex >= 0) funcIndex += 20000; } // Optional methods
-        if (funcIndex == -1) { if (onmsg) { onmsg("Unabled to compile, unknown command: " + keywords[0]); } return ''; }
-        // Encode CommandId, CmdSize, ArgCount, Arg1Len, Arg1, Arg2Len, Arg2...
-        var cmd = ShortToStr(keywords.length - 1);
-        for (var j in keywords) {
-            if (j == 0) continue;
-            if (keywords[j][0] == ':') {
-                labelswap.push([keywords[j], r.length + cmd.length + 7]); // Add a label swap
-                cmd += ShortToStr(5) + String.fromCharCode(3) + IntToStr(0xFFFFFFFF); // Put an empty label
-            } else {
-                var argint = parseInt(keywords[j]);
-                if (argint == keywords[j]) {
-                    cmd += ShortToStr(5) + String.fromCharCode(2) + IntToStr(argint);
-                } else {
-                    if (keywords[j][0] == '"' && keywords[j][keywords[j].length - 1] == '"') {
-                        cmd += ShortToStr(keywords[j].length - 1) + String.fromCharCode(1) + keywords[j].substring(1, keywords[j].length - 1);
-                    } else {
-                        cmd += ShortToStr(keywords[j].length + 1) + String.fromCharCode(0) + keywords[j];
-                    }
-                }
-            }
-        }
-        cmd = ShortToStr(funcIndex) + ShortToStr(cmd.length + 4) + cmd;
-        r += cmd;
-    }
-    // Perform all the needed label swaps
-    for (i in labelswap) {
-        var label = labelswap[i][0].toUpperCase(), position = labelswap[i][1], target = labels[label];
-        if (target == undefined) { if (onmsg) { onmsg("Unabled to compile, unknown label: " + label); } return ''; }
-        r = r.substr(0, position) + IntToStr(target) + r.substr(position + 4);
-    }
-    return IntToStr(0x247D2945) + ShortToStr(1) + r;
-}
-
-// Decompile the script, intended for debugging only
-function script_decompile(binary, onecmd) {
-    var r = '', ptr = 6, labelcount = 0, labels = {};
-    if (onecmd >= 0) {
-        ptr = onecmd; // If we are decompiling just one command, set the ptr to that command.
-    } else {
-        if (binary.length < 6) { return '# Invalid script length'; }
-        var magic = ReadInt(binary, 0);
-        var version = ReadShort(binary, 4);
-        if (magic != 0x247D2945) { return '# Invalid binary script: ' + magic; }
-        if (version != 1) { return '# Invalid script version'; }
-    }
-    // Loop on each command, moving forward by the command length each time.
-    while (ptr < binary.length) {
-        var cmdid = ReadShort(binary, ptr);
-        var cmdlen = ReadShort(binary, ptr + 2);
-        var argcount = ReadShort(binary, ptr + 4);
-        var argptr = ptr + 6;
-        var argstr = '';
-        if (!(onecmd >= 0)) r += ":label" + (ptr - 6) + "\n";
-        // Loop on each argument, moving forward by the argument length each time
-        for (var i = 0; i < argcount; i++) {
-            var arglen = ReadShort(binary, argptr);
-            var argval = binary.substring(argptr + 2, argptr + 2 + arglen);
-            var argtyp = argval.charCodeAt(0);
-            if (argtyp == 0) { argstr += ' ' + argval.substring(1); } // Variable
-            else if (argtyp == 1) { argstr += ' \"' + argval.substring(1) + '\"'; } // String
-            else if (argtyp == 2) { argstr += ' ' + ReadInt(argval, 1); } // Integer
-            else if (argtyp == 3) { // Label
-                var target = ReadInt(argval, 1);
-                var label = labels[target];
-                if (!label) { label = ":label" + target; labels[label] = target; }
-                argstr += ' ' + label;
-            }
-            argptr += (2 + arglen);
-        }
-        // Go in the script function table to decode the function
-        if (cmdid < 10000) {
-            r += script_functionTable1[cmdid] + argstr + "\n";
-        } else {
-            if (cmdid >= 20000) {
-                r += script_functionTable3[cmdid - 20000] + argstr + "\n"; // Optional methods
-            } else {
-                r += script_functionTable2[cmdid - 10000] + argstr + "\n";
-            }
-        }
-        ptr += cmdlen;
-        if (onecmd >= 0) return r; // If we are decompiling just one command, exit now
-    }
-    // Remove all unused labels
-    var scriptlines = r.split('\n');
-    r = '';
-    for (var i in scriptlines) {
-        var line = scriptlines[i];
-        if (line[0] != ':') { r += line + '\n'; } else { if (labels[line]) { r += line + '\n'; } }
-    }
-    return r;
-}
diff --git a/agents/modules_meshcmd/amt-wsman-0.2.0.js b/agents/modules_meshcmd/amt-wsman-0.2.0.js
deleted file mode 100644
index 4ad00aa0..00000000
--- a/agents/modules_meshcmd/amt-wsman-0.2.0.js
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
-Copyright 2018 Intel Corporation
-
-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.
-*/
-
-/** 
-* @description Intel(r) AMT WSMAN Stack
-* @author Ylian Saint-Hilaire
-* @version v0.2.0
-*/
-
-// Construct a MeshServer object
-function WsmanStackCreateService(CreateWsmanComm, host, port, user, pass, tls, extra) {
-    var obj = {};
-    //obj.onDebugMessage = null;          // Set to a function if you want to get debug messages.
-    obj.NextMessageId = 1;              // Next message number, used to label WSMAN calls.
-    obj.Address = '/wsman';
-    obj.comm = new CreateWsmanComm(host, port, user, pass, tls, extra);
-
-    obj.PerformAjax = function (postdata, callback, tag, pri, namespaces) {
-        if (namespaces == null) namespaces = '';
-        obj.comm.PerformAjax('<?xml version=\"1.0\" encoding=\"utf-8\"?><Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:a="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:w="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd" xmlns=\"http://www.w3.org/2003/05/soap-envelope\" ' + namespaces + '><Header><a:Action>' + postdata, function (data, status, tag) {
-            if (status != 200) { callback(obj, null, { Header: { HttpError: status } }, status, tag); return; }
-            var wsresponse = obj.ParseWsman(data);
-            if (!wsresponse || wsresponse == null) { callback(obj, null, { Header: { HttpError: status } }, 601, tag); } else { callback(obj, wsresponse.Header["ResourceURI"], wsresponse, 200, tag); }
-        }, tag, pri);
-    }
-
-    // Private method
-    //obj.Debug = function (msg) { /*console.log(msg);*/ }
-
-    // Cancel all pending queries with given status
-    obj.CancelAllQueries = function (s) { obj.comm.CancelAllQueries(s); }
-
-    // Get the last element of a URI string
-    obj.GetNameFromUrl = function (resuri) {
-        var x = resuri.lastIndexOf("/");
-        return (x == -1)?resuri:resuri.substring(x + 1);
-    }
-
-    // Perform a WSMAN Subscribe operation
-    obj.ExecSubscribe = function (resuri, delivery, url, callback, tag, pri, selectors, opaque, user, pass) {
-        var digest = "", digest2 = "", opaque = "";
-        if (user != null && pass != null) { digest = '<t:IssuedTokens xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:se="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><t:RequestSecurityTokenResponse><t:TokenType>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#UsernameToken</t:TokenType><t:RequestedSecurityToken><se:UsernameToken><se:Username>' + user + '</se:Username><se:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd#PasswordText">' + pass + '</se:Password></se:UsernameToken></t:RequestedSecurityToken></t:RequestSecurityTokenResponse></t:IssuedTokens>'; digest2 = '<w:Auth Profile="http://schemas.dmtf.org/wbem/wsman/1/wsman/secprofile/http/digest"/>'; }
-        if (opaque != null) { opaque = '<a:ReferenceParameters><m:arg>' + opaque + '</m:arg></a:ReferenceParameters>'; }
-        if (delivery == 'PushWithAck') { delivery = 'dmtf.org/wbem/wsman/1/wsman/PushWithAck'; } else if (delivery == 'Push') { delivery = 'xmlsoap.org/ws/2004/08/eventing/DeliveryModes/Push'; }
-        var data = "http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe</a:Action><a:To>" + obj.Address + "</a:To><w:ResourceURI>" + resuri + "</w:ResourceURI><a:MessageID>" + (obj.NextMessageId++) + "</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo>" + _PutObjToSelectorsXml(selectors) + digest + '</Header><Body><e:Subscribe><e:Delivery Mode="http://schemas.' + delivery + '"><e:NotifyTo><a:Address>' + url + '</a:Address>' + opaque + '</e:NotifyTo>' + digest2 + '</e:Delivery></e:Subscribe>';
-        obj.PerformAjax(data + "</Body></Envelope>", callback, tag, pri, 'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing" xmlns:m="http://x.com"');
-    }
-
-    // Perform a WSMAN UnSubscribe operation
-    obj.ExecUnSubscribe = function (resuri, callback, tag, pri, selectors) {
-        var data = "http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe</a:Action><a:To>" + obj.Address + "</a:To><w:ResourceURI>" + resuri + "</w:ResourceURI><a:MessageID>" + (obj.NextMessageId++) + "</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo>" + _PutObjToSelectorsXml(selectors) + '</Header><Body><e:Unsubscribe/>';
-        obj.PerformAjax(data + "</Body></Envelope>", callback, tag, pri, 'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing"');
-    }
-
-    // Perform a WSMAN PUT operation
-    obj.ExecPut = function (resuri, putobj, callback, tag, pri, selectors) {
-        var data = "http://schemas.xmlsoap.org/ws/2004/09/transfer/Put</a:Action><a:To>" + obj.Address + "</a:To><w:ResourceURI>" + resuri + "</w:ResourceURI><a:MessageID>" + (obj.NextMessageId++) + "</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60.000S</w:OperationTimeout>" + _PutObjToSelectorsXml(selectors) + '</Header><Body>' + _PutObjToBodyXml(resuri, putobj);
-        obj.PerformAjax(data + "</Body></Envelope>", callback, tag, pri);
-    }
-		
-    // Perform a WSMAN CREATE operation
-    obj.ExecCreate = function (resuri, putobj, callback, tag, pri, selectors) {
-        var objname = obj.GetNameFromUrl(resuri);
-        var data = "http://schemas.xmlsoap.org/ws/2004/09/transfer/Create</a:Action><a:To>" + obj.Address + "</a:To><w:ResourceURI>" + resuri + "</w:ResourceURI><a:MessageID>" + (obj.NextMessageId++) + "</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout>" + _PutObjToSelectorsXml(selectors) + "</Header><Body><g:" + objname + " xmlns:g=\"" + resuri + "\">";
-        for (var n in putobj) { data += "<g:" + n + ">" + putobj[n] + "</g:" + n + ">" } 
-        obj.PerformAjax(data + "</g:" + objname + "></Body></Envelope>", callback, tag, pri);
-    }
-
-    // Perform a WSMAN DELETE operation
-    obj.ExecDelete = function (resuri, putobj, callback, tag, pri) {
-        var data = "http://schemas.xmlsoap.org/ws/2004/09/transfer/Delete</a:Action><a:To>" + obj.Address + "</a:To><w:ResourceURI>" + resuri + "</w:ResourceURI><a:MessageID>" + (obj.NextMessageId++) + "</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout>" + _PutObjToSelectorsXml(putobj) + "</Header><Body /></Envelope>";
-        obj.PerformAjax(data, callback, tag, pri);
-    }
-
-    // Perform a WSMAN GET operation
-    obj.ExecGet = function (resuri, callback, tag, pri) {
-        obj.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Get</a:Action><a:To>" + obj.Address + "</a:To><w:ResourceURI>" + resuri + "</w:ResourceURI><a:MessageID>" + (obj.NextMessageId++) + "</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout></Header><Body /></Envelope>", callback, tag, pri);
-    }
-
-	// Perform a WSMAN method call operation
-    obj.ExecMethod = function (resuri, method, args, callback, tag, pri, selectors) {
-        var argsxml = "";
-        for (var i in args) { if (args[i] != null) { if (Array.isArray(args[i])) { for (var x in args[i]) { argsxml += "<r:" + i + ">" + args[i][x] + "</r:" + i + ">"; } } else { argsxml += "<r:" + i + ">" + args[i] + "</r:" + i + ">"; } } }
-        obj.ExecMethodXml(resuri, method, argsxml, callback, tag, pri, selectors);
-    }
-	
-    // Perform a WSMAN method call operation. The arguments are already formatted in XML.
-    obj.ExecMethodXml = function (resuri, method, argsxml, callback, tag, pri, selectors) {
-        obj.PerformAjax(resuri + "/" + method + "</a:Action><a:To>" + obj.Address + "</a:To><w:ResourceURI>" + resuri + "</w:ResourceURI><a:MessageID>" + (obj.NextMessageId++) + "</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout>" + _PutObjToSelectorsXml(selectors) + "</Header><Body><r:" + method + '_INPUT' + " xmlns:r=\"" + resuri + "\">" + argsxml + "</r:" + method + "_INPUT></Body></Envelope>", callback, tag, pri);
-    }
-
-    // Perform a WSMAN ENUM operation
-    obj.ExecEnum = function (resuri, callback, tag, pri) {
-        obj.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Enumerate</a:Action><a:To>" + obj.Address + "</a:To><w:ResourceURI>" + resuri + "</w:ResourceURI><a:MessageID>" + (obj.NextMessageId++) + "</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout></Header><Body><Enumerate xmlns=\"http://schemas.xmlsoap.org/ws/2004/09/enumeration\" /></Body></Envelope>", callback, tag, pri);
-    }
-
-    // Perform a WSMAN PULL operation
-    obj.ExecPull = function (resuri, enumctx, callback, tag, pri) {
-        obj.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Pull</a:Action><a:To>" + obj.Address + "</a:To><w:ResourceURI>" + resuri + "</w:ResourceURI><a:MessageID>" + (obj.NextMessageId++) + "</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout></Header><Body><Pull xmlns=\"http://schemas.xmlsoap.org/ws/2004/09/enumeration\"><EnumerationContext>" + enumctx + "</EnumerationContext><MaxElements>999</MaxElements><MaxCharacters>99999</MaxCharacters></Pull></Body></Envelope>", callback, tag, pri);
-    }
-
-    // Private method
-    obj.ParseWsman = function (xml) {
-        try {
-            if (!xml.childNodes) xml = _turnToXml(xml);
-            var r = { Header:{} }, header = xml.getElementsByTagName("Header")[0], t;
-            if (!header) header = xml.getElementsByTagName("a:Header")[0];
-            if (!header) return null;
-            for (var i = 0; i < header.childNodes.length; i++) {
-                var child = header.childNodes[i];
-                r.Header[child.localName] = child.textContent;
-            }
-            var body = xml.getElementsByTagName("Body")[0];
-            if (!body) body = xml.getElementsByTagName("a:Body")[0];
-            if (!body) return null;
-            if (body.childNodes.length > 0) {
-                t = body.childNodes[0].localName;
-                if (t.indexOf("_OUTPUT") == t.length - 7) { t = t.substring(0, t.length - 7); }
-                r.Header['Method'] = t;
-                r.Body = _ParseWsmanRec(body.childNodes[0]);
-		    }
-            return r;
-        } catch (e) {
-            console.log("Unable to parse XML: " + xml);
-            return null;
-        }
-    }
-
-    // Private method
-    function _ParseWsmanRec(node) {
-        var data, r = {};
-        for (var i = 0; i < node.childNodes.length; i++) {
-            var child = node.childNodes[i];
-            if ((child.childElementCount == null) || (child.childElementCount == 0)) { data = child.textContent; } else { data = _ParseWsmanRec(child); }
-            if (data == 'true') data = true; // Convert 'true' into true
-            if (data == 'false') data = false; // Convert 'false' into false
-            if ((parseInt(data) + '') === data) data = parseInt(data); // Convert integers
-
-            var childObj = data;
-            if ((child.attributes != null) && (child.attributes.length > 0)) {
-				childObj = { 'Value': data };
-				for(var j = 0; j < child.attributes.length; j++) {
-					childObj['@' + child.attributes[j].name] = child.attributes[j].value;
-				}
-			}
-			
-            if (r[child.localName] instanceof Array) { r[child.localName].push(childObj); }
-            else if (r[child.localName] == null) { r[child.localName] = childObj; }
-            else { r[child.localName] = [r[child.localName], childObj]; }
-        }
-        return r;
-    }
-
-    function _PutObjToBodyXml(resuri, putObj) {
-        if (!resuri || putObj == null) return '';
-		var objname = obj.GetNameFromUrl(resuri);
-		var result = '<r:' + objname + ' xmlns:r="' + resuri + '">';
-
-		for (var prop in putObj) {
-			if (!putObj.hasOwnProperty(prop) || prop.indexOf('__') === 0 || prop.indexOf('@') === 0) continue;
-			if (putObj[prop] == null || typeof putObj[prop] === 'function') continue;
-			if (typeof putObj[prop] === 'object' && putObj[prop]['ReferenceParameters']) {
-				result += '<r:' + prop + '><a:Address>' + putObj[prop].Address + '</a:Address><a:ReferenceParameters><w:ResourceURI>' + putObj[prop]['ReferenceParameters']["ResourceURI"] + '</w:ResourceURI><w:SelectorSet>';
-				var selectorArray = putObj[prop]['ReferenceParameters']['SelectorSet']['Selector'];
-				if (Array.isArray(selectorArray)) {
-					for (var i=0; i< selectorArray.length; i++) {
-						result += '<w:Selector' + _ObjectToXmlAttributes(selectorArray[i]) + '>' + selectorArray[i]['Value'] + '</w:Selector>';
-					}
-				}
-				else {
-					result += '<w:Selector' + _ObjectToXmlAttributes(selectorArray) + '>' + selectorArray['Value'] + '</w:Selector>';
-				}
-				result += '</w:SelectorSet></a:ReferenceParameters></r:' + prop + '>';
-			}
-			else {
-			    if (Array.isArray(putObj[prop])) {
-			        for (var i = 0; i < putObj[prop].length; i++) {
-			            result += '<r:' + prop + '>' + putObj[prop][i].toString() + '</r:' + prop + '>';
-			        }
-			    } else {
-			        result += '<r:' + prop + '>' + putObj[prop].toString() + '</r:' + prop + '>';
-			    }
-			}
-		}
-
-		result += '</r:' + objname + '>';
-		return result;
-	}
-
-	/* 
-	convert 
-		{ @Name: 'InstanceID', @AttrName: 'Attribute Value'}
-	into
-		' Name="InstanceID" AttrName="Attribute Value" '
-	*/
-    function _ObjectToXmlAttributes(objWithAttributes) {
-		if(!objWithAttributes) return '';
-		var result = ' ';
-		for (var propName in objWithAttributes) {
-			if (!objWithAttributes.hasOwnProperty(propName) || propName.indexOf('@') !== 0) continue;
-			result += propName.substring(1) + '="' + objWithAttributes[propName] + '" ';
-		}
-		return result;
-	}
-
-    function _PutObjToSelectorsXml(selectorSet) {
-        if (!selectorSet) return '';
-        if (typeof selectorSet == 'string') return selectorSet;
-        if (selectorSet['InstanceID']) return "<w:SelectorSet><w:Selector Name=\"InstanceID\">" + selectorSet['InstanceID'] + "</w:Selector></w:SelectorSet>";
-		var result = '<w:SelectorSet>';
-		for(var propName in selectorSet) {
-		    if (!selectorSet.hasOwnProperty(propName)) continue;
-		    result += '<w:Selector Name="' + propName + '">';
-		    if (selectorSet[propName]['ReferenceParameters']) {
-		        result += '<a:EndpointReference>';
-		        result += '<a:Address>' + selectorSet[propName]['Address'] + '</a:Address><a:ReferenceParameters><w:ResourceURI>' + selectorSet[propName]['ReferenceParameters']['ResourceURI'] + '</w:ResourceURI><w:SelectorSet>';
-		        var selectorArray = selectorSet[propName]['ReferenceParameters']['SelectorSet']['Selector'];
-		        if (Array.isArray(selectorArray)) {
-		            for (var i = 0; i < selectorArray.length; i++) {
-		                result += '<w:Selector' + _ObjectToXmlAttributes(selectorArray[i]) + '>' + selectorArray[i]['Value'] + '</w:Selector>';
-		            }
-		        }
-		        else {
-		            result += '<w:Selector' + _ObjectToXmlAttributes(selectorArray) + '>' + selectorArray['Value'] + '</w:Selector>';
-		        }
-		        result += '</w:SelectorSet></a:ReferenceParameters></a:EndpointReference>';
-		    } else {
-		        result += selectorSet[propName];
-		    }
-			result += '</w:Selector>';
-		}
-		result += '</w:SelectorSet>';
-		return result;
-	}
-
-    // This is a drop-in replacement to _turnToXml() that works without xml parser dependency.
-    Object.defineProperty(Array.prototype, "peek", { value: function () { return (this.length > 0 ? this[this.length - 1] : null); } });
-    function _treeBuilder() {
-        this.tree = [];
-        this.push = function (element) { this.tree.push(element); };
-        this.pop = function () { var element = this.tree.pop(); if (this.tree.length > 0) { var x = this.tree.peek(); x.childNodes.push(element); x.childElementCount = x.childNodes.length; } return (element); };
-        this.peek = function () { return (this.tree.peek()); }
-        this.addNamespace = function (prefix, namespace) { this.tree.peek().nsTable[prefix] = namespace; if (this.tree.peek().attributes.length > 0) { for (var i = 0; i < this.tree.peek().attributes; ++i) { var a = this.tree.peek().attributes[i]; if (prefix == '*' && a.name == a.localName) { a.namespace = namespace; } else if (prefix != '*' && a.name != a.localName) { var pfx = a.name.split(':')[0]; if (pfx == prefix) { a.namespace = namespace; } } } } }
-        this.getNamespace = function (prefix) { for (var i = this.tree.length - 1; i >= 0; --i) { if (this.tree[i].nsTable[prefix] != null) { return (this.tree[i].nsTable[prefix]); } } return null; }
-    }
-    function _turnToXml(text) { if (text == null) return null; return ({ childNodes: [_turnToXmlRec(text)], getElementsByTagName: _getElementsByTagName, getChildElementsByTagName: _getChildElementsByTagName, getElementsByTagNameNS: _getElementsByTagNameNS }); }
-    function _getElementsByTagNameNS(ns, name) { var ret = []; _xmlTraverseAllRec(this.childNodes, function (node) { if (node.localName == name && (node.namespace == ns || ns == '*')) { ret.push(node); } }); return ret; }
-    function _getElementsByTagName(name) { var ret = []; _xmlTraverseAllRec(this.childNodes, function (node) { if (node.localName == name) { ret.push(node); } }); return ret; }
-    function _getChildElementsByTagName(name) { var ret = []; if (this.childNodes != null) { for (var node in this.childNodes) { if (this.childNodes[node].localName == name) { ret.push(this.childNodes[node]); } } } return (ret); }
-    function _getChildElementsByTagNameNS(ns, name) { var ret = []; if (this.childNodes != null) { for (var node in this.childNodes) { if (this.childNodes[node].localName == name && (ns == '*' || this.childNodes[node].namespace == ns)) { ret.push(this.childNodes[node]); } } } return (ret); }
-    function _xmlTraverseAllRec(nodes, func) { for (var i in nodes) { func(nodes[i]); if (nodes[i].childNodes) { _xmlTraverseAllRec(nodes[i].childNodes, func); } } }
-    function _turnToXmlRec(text) {
-        var elementStack = new _treeBuilder(), lastElement = null, x1 = text.split('<'), ret = [], element = null, currentElementName = null;
-        for (var i in x1) {
-            var x2 = x1[i].split('>'), x3 = x2[0].split(' '), elementName = x3[0];
-            if ((elementName.length > 0) && (elementName[0] != '?')) {
-                if (elementName[0] != '/') {
-                    var attributes = [], localName, localname2 = elementName.split(' ')[0].split(':'), localName = (localname2.length > 1) ? localname2[1] : localname2[0];
-                    Object.defineProperty(attributes, "get",
-                    {
-                        value: function () {
-                            if (arguments.length == 1) {
-                                for (var a in this) { if (this[a].name == arguments[0]) { return (this[a]); } }
-                            }
-                            else if (arguments.length == 2) {
-                                for (var a in this) { if (this[a].name == arguments[1] && (arguments[0] == '*' || this[a].namespace == arguments[0])) { return (this[a]); } }
-                            }
-                            else {
-                                throw ('attributes.get(): Invalid number of parameters');
-                            }
-                        }
-                    });
-                    elementStack.push({ name: elementName, localName: localName, getChildElementsByTagName: _getChildElementsByTagName, getElementsByTagNameNS: _getElementsByTagNameNS, getChildElementsByTagNameNS: _getChildElementsByTagNameNS, attributes: attributes, childNodes: [], nsTable: {} });
-                    // Parse Attributes
-                    if (x3.length > 0) {
-                        var skip = false;
-                        for (var j in x3) {
-                            if (x3[j] == '/') {
-                                // This is an empty Element
-                                elementStack.peek().namespace = elementStack.peek().name == elementStack.peek().localName ? elementStack.getNamespace('*') : elementStack.getNamespace(elementStack.peek().name.substring(0, elementStack.peek().name.indexOf(':')));
-                                elementStack.peek().textContent = '';
-                                lastElement = elementStack.pop();
-                                skip = true;
-                                break;
-                            }
-                            var k = x3[j].indexOf('=');
-                            if (k > 0) {
-                                var attrName = x3[j].substring(0, k);
-                                var attrValue = x3[j].substring(k + 2, x3[j].length - 1);
-                                var attrNS = elementStack.getNamespace('*');
-
-                                if (attrName == 'xmlns') {
-                                    elementStack.addNamespace('*', attrValue);
-                                    attrNS = attrValue;
-                                } else if (attrName.startsWith('xmlns:')) {
-                                    elementStack.addNamespace(attrName.substring(6), attrValue);
-                                } else {
-                                    var ax = attrName.split(':');
-                                    if (ax.length == 2) { attrName = ax[1]; attrNS = elementStack.getNamespace(ax[0]); }
-                                }
-                                var x = { name: attrName, value: attrValue }
-                                if (attrNS != null) x.namespace = attrNS;
-                                elementStack.peek().attributes.push(x);
-                            }
-                        }
-                        if (skip) { continue; }
-                    }
-                    elementStack.peek().namespace = elementStack.peek().name == elementStack.peek().localName ? elementStack.getNamespace('*') : elementStack.getNamespace(elementStack.peek().name.substring(0, elementStack.peek().name.indexOf(':')));
-                    if (x2[1]) { elementStack.peek().textContent = x2[1]; }
-                } else { lastElement = elementStack.pop(); }
-            }
-        }
-        return lastElement;
-    }
-
-    return obj;
-}
-
-module.exports = WsmanStackCreateService;
diff --git a/agents/modules_meshcmd/amt-wsman-duk-0.2.0.js b/agents/modules_meshcmd/amt-wsman-duk-0.2.0.js
deleted file mode 100644
index ce655873..00000000
--- a/agents/modules_meshcmd/amt-wsman-duk-0.2.0.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-Copyright 2018 Intel Corporation
-
-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.
-*/
-
-/** 
-* @description WSMAN communication using duktape http
-* @author Ylian Saint-Hilaire
-* @version v0.2.0c
-*/
-
-// Construct a WSMAN communication object
-function CreateWsmanComm(host, port, user, pass, tls, extra) {
-    var obj = {};
-    obj.PendingAjax = [];               // List of pending AJAX calls. When one frees up, another will start.
-    obj.ActiveAjaxCount = 0;            // Number of currently active AJAX calls
-    obj.MaxActiveAjaxCount = 1;         // Maximum number of activate AJAX calls at the same time.
-    obj.FailAllError = 0;               // Set this to non-zero to fail all AJAX calls with that error status, 999 causes responses to be silent.
-    obj.host = host;
-    obj.port = port;
-    obj.user = user;
-    obj.pass = pass;
-    obj.tls = tls;
-    obj.digest = null;
-    obj.RequestCount = 0;
-
-    // Private method
-    //   pri = priority, if set to 1, the call is high priority and put on top of the stack.
-    obj.PerformAjax = function (postdata, callback, tag, pri, url, action) {
-        if ((obj.ActiveAjaxCount == 0 || ((obj.ActiveAjaxCount < obj.MaxActiveAjaxCount) && (obj.challengeParams != null))) && obj.PendingAjax.length == 0) {
-            // There are no pending AJAX calls, perform the call now.
-            obj.PerformAjaxEx(postdata, callback, tag, url, action);
-        } else {
-            // If this is a high priority call, put this call in front of the array, otherwise put it in the back.
-            if (pri == 1) { obj.PendingAjax.unshift([postdata, callback, tag, url, action]); } else { obj.PendingAjax.push([postdata, callback, tag, url, action]); }
-        }
-    }
-
-    // Private method
-    obj.PerformNextAjax = function () {
-        if (obj.ActiveAjaxCount >= obj.MaxActiveAjaxCount || obj.PendingAjax.length == 0) return;
-        var x = obj.PendingAjax.shift();
-        obj.PerformAjaxEx(x[0], x[1], x[2], x[3], x[4]);
-        obj.PerformNextAjax();
-    }
-
-    // Private method
-    obj.PerformAjaxEx = function (postdata, callback, tag, url, action) {
-        if (obj.FailAllError != 0) { if (obj.FailAllError != 999) { obj.gotNextMessagesError({ status: obj.FailAllError }, 'error', null, [postdata, callback, tag]); } return; }
-        if (!postdata) postdata = "";
-        //console.log("SEND: " + postdata); // DEBUG
-
-        // We are in a DukTape environement
-        if (obj.digest == null) { obj.digest = require('http-digest').create(obj.user, obj.pass); obj.digest.http = require('http'); }
-        var request = { protocol: (obj.tls == 1 ? 'https:' : 'http:'), method: 'POST', host: obj.host, path: '/wsman', port: obj.port, rejectUnauthorized: false, checkServerIdentity: function (cert) { console.log('checkServerIdentity', JSON.stringify(cert)); } };
-        var req = obj.digest.request(request);
-        //console.log('Request ' + (obj.RequestCount++));
-        req.on('error', function (e) { obj.gotNextMessagesError({ status: 600 }, 'error', null, [postdata, callback, tag]); });
-        req.on('response', function (response) {
-            //console.log('Response: ' + response.statusCode);
-            if (response.statusCode != 200) {
-                console.log('ERR:' + JSON.stringify(response));
-                obj.gotNextMessagesError({ status: response.statusCode }, 'error', null, [postdata, callback, tag]);
-            } else {
-                response.acc = '';
-                response.on('data', function (data2) { this.acc += data2; });
-                response.on('end', function () { obj.gotNextMessages(response.acc, 'success', { status: response.statusCode }, [postdata, callback, tag]); });
-            }
-        });
-
-        // Send POST body, this work with binary.
-        req.write(postdata);
-        req.end();
-        obj.ActiveAjaxCount++;
-        return req;
-    }
-
-    // AJAX specific private method
-    obj.pendingAjaxCall = [];
-
-    // Private method
-    obj.gotNextMessages = function (data, status, request, callArgs) {
-        obj.ActiveAjaxCount--;
-        if (obj.FailAllError == 999) return;
-        //console.log("RECV: " + data); // DEBUG
-        if (obj.FailAllError != 0) { callArgs[1](null, obj.FailAllError, callArgs[2]); return; }
-        if (request.status != 200) { callArgs[1](null, request.status, callArgs[2]); return; }
-        callArgs[1](data, 200, callArgs[2]);
-        obj.PerformNextAjax();
-    }
-
-    // Private method
-    obj.gotNextMessagesError = function (request, status, errorThrown, callArgs) {
-        obj.ActiveAjaxCount--;
-        if (obj.FailAllError == 999) return;
-        if (obj.FailAllError != 0) { callArgs[1](null, obj.FailAllError, callArgs[2]); return; }
-        //if (status != 200) { console.log("ERROR, status=" + status + "\r\n\r\nreq=" + callArgs[0]); } // Debug: Display the request & response if something did not work.
-        if (obj.FailAllError != 999) { callArgs[1]({ Header: { HttpError: request.status } }, request.status, callArgs[2]); }
-        obj.PerformNextAjax();
-    }
-
-    // Cancel all pending queries with given status
-    obj.CancelAllQueries = function (s) {
-        while (obj.PendingAjax.length > 0) { var x = obj.PendingAjax.shift(); x[1](null, s, x[2]); }
-    }
-
-    return obj;
-}
-
-module.exports = CreateWsmanComm;
diff --git a/agents/modules_meshcmd/amt.js b/agents/modules_meshcmd/amt.js
index aa3b2f9d..166fddaf 100644
--- a/agents/modules_meshcmd/amt.js
+++ b/agents/modules_meshcmd/amt.js
@@ -356,8 +356,8 @@ function AmtStackCreateService(wsmanStack) {
     obj.IPS_HostBasedSetupService_UpgradeClientToAdmin = function (McNonce, SigningAlgorithm, DigitalSignature, callback_func) { obj.Exec("IPS_HostBasedSetupService", "UpgradeClientToAdmin", { "McNonce": McNonce, "SigningAlgorithm": SigningAlgorithm, "DigitalSignature": DigitalSignature }, callback_func); }
     obj.IPS_HostBasedSetupService_DisableClientControlMode = function (_method_dummy, callback_func) { obj.Exec("IPS_HostBasedSetupService", "DisableClientControlMode", { "_method_dummy": _method_dummy }, callback_func); }
     obj.IPS_KVMRedirectionSettingData_TerminateSession = function (callback_func) { obj.Exec("IPS_KVMRedirectionSettingData", "TerminateSession", {}, callback_func); }
-    obj.IPS_KVMRedirectionSettingData_DataChannelRead = function (callback_func) { obj.Exec("IPS_KVMRedirectionSettingData", "DataChannelRead", {}, callback_func); }
-    obj.IPS_KVMRedirectionSettingData_DataChannelWrite = function (Data, callback_func) { obj.Exec("IPS_KVMRedirectionSettingData", "DataChannelWrite", { "DataMessage": Data }, callback_func); }
+    obj.IPS_KVMRedirectionSettingData_DataChannelRead = function (callback_func, tag) { obj.Exec("IPS_KVMRedirectionSettingData", "DataChannelRead", {}, callback_func, tag); }
+    obj.IPS_KVMRedirectionSettingData_DataChannelWrite = function (Data, callback_func, tag) { obj.Exec("IPS_KVMRedirectionSettingData", "DataChannelWrite", { "DataMessage": Data }, callback_func, tag); }
     obj.IPS_OptInService_StartOptIn = function (callback_func) { obj.Exec("IPS_OptInService", "StartOptIn", {}, callback_func); }
     obj.IPS_OptInService_CancelOptIn = function (callback_func) { obj.Exec("IPS_OptInService", "CancelOptIn", {}, callback_func); }
     obj.IPS_OptInService_SendOptInCode = function (OptInCode, callback_func) { obj.Exec("IPS_OptInService", "SendOptInCode", { "OptInCode": OptInCode }, callback_func); }
diff --git a/agents/modules_meshcmd/amt_heci.js b/agents/modules_meshcmd/amt_heci.js
deleted file mode 100644
index 970e0271..00000000
--- a/agents/modules_meshcmd/amt_heci.js
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-Copyright 2018 Intel Corporation
-
-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.
-*/
-
-var Q = require('queue');
-
-function amt_heci() {
-    var emitterUtils = require('events').inherits(this);
-    emitterUtils.createEvent('error');
-    emitterUtils.createEvent('connect');
-
-    var heci = require('heci');
-
-    this._amt = heci.create();
-    this._amt.BiosVersionLen = 65;
-    this._amt.UnicodeStringLen = 20;
-
-    this._amt.rq = new Q();
-    this._amt.Parent = this;
-    this._amt.on('error', function (e) { this.Parent.emit('error', e); });
-    this._amt.on('connect', function () {
-        this.Parent.emit('connect');
-        this.on('data', function (chunk) {
-            //console.log("Received: " + chunk.length + " bytes");
-            var header = this.Parent.getCommand(chunk);
-            //console.log("CMD = " + header.Command + " (Status: " + header.Status + ") Response = " + header.IsResponse);
-
-            var user = this.rq.deQueue();
-            var params = user.optional;
-            var callback = user.func;
-
-            params.unshift(header);
-            callback.apply(this.Parent, params);
-        });
-    });
-    this._amt.connect(heci.GUIDS.AMT, { noPipeline: 1 });
-
-    this.getCommand = function (chunk) {
-        var command = chunk.length == 0 ? (this._amt.rq.peekQueue().cmd | 0x800000) : chunk.readUInt32LE(4);
-        var ret = { IsResponse: (command & 0x800000) == 0x800000 ? true : false, Command: (command & 0x7FFFFF), Status: chunk.length != 0 ? chunk.readUInt32LE(12) : -1, Data: chunk.length != 0 ? chunk.slice(16) : null };
-        return (ret);
-    };
-
-    this.sendCommand = function () {
-        if (arguments.length < 3 || typeof (arguments[0]) != 'number' || typeof (arguments[1]) != 'object' || typeof (arguments[2]) != 'function') { throw ('invalid parameters'); }
-        var args = [];
-        for (var i = 3; i < arguments.length; ++i) { args.push(arguments[i]); }
-
-        this._amt.rq.enQueue({ cmd: arguments[0], func: arguments[2], optional: args });
-
-        var header = Buffer.from('010100000000000000000000', 'hex');
-        header.writeUInt32LE(arguments[0] | 0x04000000, 4);
-        header.writeUInt32LE(arguments[1] == null ? 0 : arguments[1].length, 8);
-
-        this._amt.write(arguments[1] == null ? header : Buffer.concat([header, arguments[1]]));
-    }
-
-    this.getVersion = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(26, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var i, CodeVersion = header.Data, val = { BiosVersion: CodeVersion.slice(0, this._amt.BiosVersionLen), Versions: [] }, v = CodeVersion.slice(this._amt.BiosVersionLen + 4);
-                for (i = 0; i < CodeVersion.readUInt32LE(this._amt.BiosVersionLen) ; ++i) {
-                    val.Versions[i] = { Description: v.slice(2, v.readUInt16LE(0) + 2).toString(), Version: v.slice(4 + this._amt.UnicodeStringLen, 4 + this._amt.UnicodeStringLen + v.readUInt16LE(2 + this._amt.UnicodeStringLen)).toString() };
-                    v = v.slice(4 + (2 * this._amt.UnicodeStringLen));
-                }
-                opt.unshift(val);
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-
-    this.getProvisioningState = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(17, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var result = {};
-                result.state = header.Data.readUInt32LE(0);
-                if (result.state < 3) { result.stateStr = ["PRE", "IN", "POST"][result.state]; }
-                opt.unshift(result);
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getProvisioningMode = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(8, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var result = {};
-                result.mode = header.Data.readUInt32LE(0);
-                if (result.mode < 4) { result.modeStr = ["NONE", "ENTERPRISE", "SMALL_BUSINESS", "REMOTE_ASSISTANCE"][result.mode]; }
-                result.legacy = header.Data.readUInt32LE(4) == 0 ? false : true;
-                opt.unshift(result);
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getEHBCState = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(132, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                opt.unshift({ EHBC: header.Data.readUInt32LE(0) != 0 });
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getControlMode = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(107, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var result = {};
-                result.controlMode = header.Data.readUInt32LE(0);
-                if (result.controlMode < 3) { result.controlModeStr = ["NONE_RPAT", "CLIENT", "ADMIN", "REMOTE_ASSISTANCE"][result.controlMode]; }
-                opt.unshift(result);
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getMACAddresses = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(37, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                opt.unshift({ DedicatedMAC: header.Data.slice(0, 6).toString('hex:'), HostMAC: header.Data.slice(6, 12).toString('hex:') });
-            } else { opt.unshift({ DedicatedMAC: null, HostMAC: null }); }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getDnsSuffix = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(54, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var resultLen = header.Data.readUInt16LE(0);
-                if (resultLen > 0) { opt.unshift(header.Data.slice(2, 2 + resultLen).toString()); } else { opt.unshift(null); }
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getHashHandles = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x2C, null, function (header, fn, opt) {
-            var result = [];
-            if (header.Status == 0) {
-                var resultLen = header.Data.readUInt32LE(0);
-                for (var i = 0; i < resultLen; ++i) {
-                    result.push(header.Data.readUInt32LE(4 + (4 * i)));
-                }
-            }
-            opt.unshift(result);
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getCertHashEntry = function (handle, callback) {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-
-        var data = new Buffer(4);
-        data.writeUInt32LE(handle, 0);
-
-        this.sendCommand(0x2D, data, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var result = {};
-                result.isDefault = header.Data.readUInt32LE(0);
-                result.isActive = header.Data.readUInt32LE(4);
-                result.hashAlgorithm = header.Data.readUInt8(72);
-                if (result.hashAlgorithm < 4) {
-                    result.hashAlgorithmStr = ["MD5", "SHA1", "SHA256", "SHA512"][result.hashAlgorithm];
-                    result.hashAlgorithmSize = [16, 20, 32, 64][result.hashAlgorithm];
-                    result.certificateHash = header.Data.slice(8, 8 + result.hashAlgorithmSize).toString('hex');
-                }
-                result.name = header.Data.slice(73 + 2, 73 + 2 + header.Data.readUInt16LE(73)).toString();
-                opt.unshift(result);
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getCertHashEntries = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-
-        this.getHashHandles(function (handles, fn, opt) {
-            var entries = [];
-            this.getCertHashEntry(handles.shift(), this._getHashEntrySink, fn, opt, entries, handles);
-        }, callback, optional);
-    };
-    this._getHashEntrySink = function (result, fn, opt, entries, handles) {
-        entries.push(result);
-        if (handles.length > 0) {
-            this.getCertHashEntry(handles.shift(), this._getHashEntrySink, fn, opt, entries, handles);
-        } else {
-            opt.unshift(entries);
-            fn.apply(this, opt);
-        }
-    }
-    this.getLocalSystemAccount = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(103, Buffer.alloc(40), function (header, fn, opt) {
-            if (header.Data.length == 68) { opt.unshift({ user: header.Data.slice(0, 34).toString(), pass: header.Data.slice(34, 67).toString(), raw: header.Data }); } else { opt.unshift(null); }
-            fn.apply(this, opt);
-        }, callback, optional);
-    }
-    this.unprovision = function (mode, callback) {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        var data = new Buffer(4);
-        data.writeUInt32LE(mode, 0);
-        this.sendCommand(16, data, function (header, fn, opt) {
-            opt.unshift(header.Status);
-            fn.apply(this, opt);
-        }, callback, optional);
-    }
-    this.startConfiguration = function () {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x29, data, function (header, fn, opt) { opt.unshift(header.Status); fn.apply(this, opt); }, callback, optional);
-    }
-    this.stopConfiguration = function () {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x5E, data, function (header, fn, opt) { opt.unshift(header.Status); fn.apply(this, opt); }, callback, optional);
-    }
-    this.openUserInitiatedConnection = function () {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x44, data, function (header, fn, opt) { opt.unshift(header.Status); fn.apply(this, opt); }, callback, optional);
-    }
-    this.closeUserInitiatedConnection = function () {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x45, data, function (header, fn, opt) { opt.unshift(header.Status); fn.apply(this, opt); }, callback, optional);
-    }
-    this.getRemoteAccessConnectionStatus = function () {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x46, data, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var hostname = v.slice(14, header.Data.readUInt16LE(12) + 14).toString()
-                opt.unshift({ status: header.Status, networkStatus: header.Data.readUInt32LE(0), remoteAccessStatus: header.Data.readUInt32LE(4), remoteAccessTrigger: header.Data.readUInt32LE(8), mpsHostname: hostname, raw: header.Data });
-            } else {
-                opt.unshift({ status: header.Status });
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    }
-    this.getProtocolVersion = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { opt.push(arguments[i]); }
-
-        heci.doIoctl(heci.IOCTL.HECI_VERSION, Buffer.alloc(5), Buffer.alloc(5), function (status, buffer, self, fn, opt) {
-            if (status == 0) {
-                var result = buffer.readUInt8(0).toString() + '.' + buffer.readUInt8(1).toString() + '.' + buffer.readUInt8(2).toString() + '.' + buffer.readUInt16BE(3).toString();
-                opt.unshift(result);
-                fn.apply(self, opt);
-            }
-            else {
-                opt.unshift(null);
-                fn.apply(self, opt);
-            }
-        }, this, callback, optional);
-    }
-}
-
-module.exports = amt_heci;
\ No newline at end of file
diff --git a/agents/modules_meshcmd/lme_heci.js b/agents/modules_meshcmd/lme_heci.js
deleted file mode 100644
index 011e17e1..00000000
--- a/agents/modules_meshcmd/lme_heci.js
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
-Copyright 2018 Intel Corporation
-
-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.
-*/
-
-var MemoryStream = require('MemoryStream');
-var lme_id = 0;
-var lme_port_offset = 0; // Debug: Set this to "-100" to bind to 16892 & 16893 and IN_ADDRANY. This is for LMS debugging.
-
-
-var APF_DISCONNECT = 1;
-var APF_SERVICE_REQUEST = 5;
-var APF_SERVICE_ACCEPT = 6;
-var APF_USERAUTH_REQUEST = 50;
-var APF_USERAUTH_FAILURE = 51;
-var APF_USERAUTH_SUCCESS = 52;
-var APF_GLOBAL_REQUEST = 80;
-var APF_REQUEST_SUCCESS = 81;
-var APF_REQUEST_FAILURE = 82;
-var APF_CHANNEL_OPEN = 90;
-var APF_CHANNEL_OPEN_CONFIRMATION = 91;
-var APF_CHANNEL_OPEN_FAILURE = 92;
-var APF_CHANNEL_WINDOW_ADJUST = 93;
-var APF_CHANNEL_DATA = 94;
-var APF_CHANNEL_CLOSE = 97;
-var APF_PROTOCOLVERSION = 192;
-
-
-function lme_object() {
-    this.ourId = ++lme_id;
-    this.amtId = -1;
-    this.LME_CHANNEL_STATUS = 'LME_CS_FREE';
-    this.txWindow = 0;
-    this.rxWindow = 0;
-    this.localPort = 0;
-    this.errorCount = 0;
-}
-
-function stream_bufferedWrite() {
-    var emitterUtils = require('events').inherits(this);
-    this.buffer = [];
-    this._readCheckImmediate = undefined;
-    
-    // Writable Events
-    emitterUtils.createEvent('close');
-    emitterUtils.createEvent('drain');
-    emitterUtils.createEvent('error');
-    emitterUtils.createEvent('finish');
-    emitterUtils.createEvent('pipe');
-    emitterUtils.createEvent('unpipe');
-    
-    // Readable Events
-    emitterUtils.createEvent('readable');
-    this.isEmpty = function () {
-        return (this.buffer.length == 0);
-    };
-    this.isWaiting = function () {
-        return (this._readCheckImmediate == undefined);
-    };
-    this.write = function (chunk) {
-        for (var args in arguments) { if (typeof (arguments[args]) == 'function') { this.once('drain', arguments[args]); break; } }
-        var tmp = Buffer.alloc(chunk.length);
-        chunk.copy(tmp);
-        this.buffer.push({ offset: 0, data: tmp });
-        this.emit('readable');
-        return (this.buffer.length == 0 ? true : false);
-    };
-    this.read = function () {
-        var size = arguments.length == 0 ? undefined : arguments[0];
-        var bytesRead = 0;
-        var list = [];
-        while ((size == undefined || bytesRead < size) && this.buffer.length > 0) {
-            var len = this.buffer[0].data.length - this.buffer[0].offset;
-            var offset = this.buffer[0].offset;
-            
-            if (len > (size - bytesRead)) {
-                // Only reading a subset
-                list.push(this.buffer[0].data.slice(offset, offset + size - bytesRead));
-                this.buffer[0].offset += (size - bytesRead);
-                bytesRead += (size - bytesRead);
-            } else {
-                // Reading the entire thing
-                list.push(this.buffer[0].data.slice(offset));
-                bytesRead += len;
-                this.buffer.shift();
-            }
-        }
-        this._readCheckImmediate = setImmediate(function (buffered) {
-            buffered._readCheckImmediate = undefined;
-            if (buffered.buffer.length == 0) {
-                buffered.emit('drain'); // Drained
-            } else {
-                buffered.emit('readable'); // Not drained
-            }
-        }, this);
-        return (Buffer.concat(list));
-    };
-}
-
-
-function lme_heci(options) {
-    var emitterUtils = require('events').inherits(this);
-    emitterUtils.createEvent('error');
-    emitterUtils.createEvent('connect');
-    
-    if (options.debug == true) { lme_port_offset = -100; } // LMS debug mode
-
-    var heci = require('heci');
-    this.INITIAL_RXWINDOW_SIZE = 4096;
-    
-    this._LME = heci.create();
-    this._LME.LMS = this;
-    this._LME.on('error', function (e) { this.LMS.emit('error', e); });
-    this._LME.on('connect', function () {
-        this.LMS.emit('connect');
-        this.on('data', function (chunk) {
-            // this = HECI
-            var cmd = chunk.readUInt8(0);
-            
-            switch (cmd) {
-                default:
-                    //console.log('Received ' + chunk.length + ' bytes of data for LMS');
-                    //console.log('Command = ' + cmd);
-                    break;
-                case APF_SERVICE_REQUEST:
-                    var nameLen = chunk.readUInt32BE(1);
-                    var name = chunk.slice(5, nameLen + 5);
-                    //console.log("Service Request for: " + name);
-                    if (name == 'pfwd@amt.intel.com' || name == 'auth@amt.intel.com') {
-                        var outBuffer = Buffer.alloc(5 + nameLen);
-                        outBuffer.writeUInt8(6, 0);
-                        outBuffer.writeUInt32BE(nameLen, 1);
-                        outBuffer.write(name.toString(), 5);
-                        this.write(outBuffer);
-                        //console.log('Answering APF_SERVICE_REQUEST');
-                    } else {
-                        //console.log('UNKNOWN APF_SERVICE_REQUEST');
-                    }
-                    break;
-                case APF_GLOBAL_REQUEST:
-                    var nameLen = chunk.readUInt32BE(1);
-                    var name = chunk.slice(5, nameLen + 5).toString();
-                    
-                    switch (name) {
-                        case 'tcpip-forward':
-                            var len = chunk.readUInt32BE(nameLen + 6);
-                            var port = chunk.readUInt32BE(nameLen + 10 + len);
-                            //console.log("[" + chunk.length + "/" + len + "] APF_GLOBAL_REQUEST for: " + name + " on port " + port);
-                            if (this[name] == undefined) {
-                                this[name] = {};
-                            }
-                            this[name][port] = require('net').createServer();
-                            this[name][port].HECI = this;
-                            if (lme_port_offset == 0) {
-                                this[name][port].listen({ port: port, host: '127.0.0.1' }); // Normal mode
-                            } else {
-                                this[name][port].listen({ port: (port + lme_port_offset) }); // Debug mode
-                            }
-                            this[name][port].on('connection', function (socket) {
-                                //console.log('New [' + socket.remoteFamily + '] TCP Connection on: ' + socket.remoteAddress + ' :' + socket.localPort);
-                                this.HECI.LMS.bindDuplexStream(socket, socket.remoteFamily, socket.localPort - lme_port_offset);
-                            });
-                            var outBuffer = Buffer.alloc(5);
-                            outBuffer.writeUInt8(81, 0);
-                            outBuffer.writeUInt32BE(port, 1);
-                            this.write(outBuffer);
-                            break;
-                        case 'cancel-tcpip-forward':
-                            break;
-                        case 'udp-send-to@amt.intel.com':
-                            break;
-                        default:
-                            //console.log("Unknown APF_GLOBAL_REQUEST for: " + name);
-                            break;
-                    }
-                    break;
-                case APF_CHANNEL_OPEN_CONFIRMATION:
-                    var rChannel = chunk.readUInt32BE(1);
-                    var sChannel = chunk.readUInt32BE(5);
-                    var wSize = chunk.readUInt32BE(9);
-                    //console.log('rChannel/' + rChannel + ', sChannel/' + sChannel + ', wSize/' + wSize);
-                    if (this.sockets[rChannel] != undefined) {
-                        this.sockets[rChannel].lme.amtId = sChannel;
-                        this.sockets[rChannel].lme.rxWindow = wSize;
-                        this.sockets[rChannel].lme.txWindow = wSize;
-                        this.sockets[rChannel].lme.LME_CHANNEL_STATUS = 'LME_CS_CONNECTED';
-                        //console.log('LME_CS_CONNECTED');
-                        this.sockets[rChannel].bufferedStream = new stream_bufferedWrite();
-                        this.sockets[rChannel].bufferedStream.socket = this.sockets[rChannel];
-                        this.sockets[rChannel].bufferedStream.on('readable', function () {
-                            if (this.socket.lme.txWindow > 0) {
-                                var buffer = this.read(this.socket.lme.txWindow);
-                                var packet = Buffer.alloc(9 + buffer.length);
-                                packet.writeUInt8(APF_CHANNEL_DATA, 0);
-                                packet.writeUInt32BE(this.socket.lme.amtId, 1);
-                                packet.writeUInt32BE(buffer.length, 5);
-                                buffer.copy(packet, 9);
-                                this.socket.lme.txWindow -= buffer.length;
-                                this.socket.HECI.write(packet);
-                            }
-                        });
-                        this.sockets[rChannel].bufferedStream.on('drain', function () {
-                            this.socket.resume();
-                        });
-                        this.sockets[rChannel].on('data', function (chunk) {
-                            if (!this.bufferedStream.write(chunk)) { this.pause(); }
-                        });
-                        this.sockets[rChannel].on('end', function () {
-                            var outBuffer = Buffer.alloc(5);
-                            outBuffer.writeUInt8(APF_CHANNEL_CLOSE, 0);
-                            outBuffer.writeUInt32BE(this.lme.amtId, 1);
-                            this.HECI.write(outBuffer);
-                        });
-                        this.sockets[rChannel].resume();
-                    }
-                    
-                    break;
-                case APF_PROTOCOLVERSION:
-                    var major = chunk.readUInt32BE(1);
-                    var minor = chunk.readUInt32BE(5);
-                    var reason = chunk.readUInt32BE(9);
-                    var outBuffer = Buffer.alloc(93);
-                    outBuffer.writeUInt8(192, 0);
-                    outBuffer.writeUInt32BE(1, 1);
-                    outBuffer.writeUInt32BE(0, 5);
-                    outBuffer.writeUInt32BE(reason, 9);
-                    //console.log('Answering PROTOCOL_VERSION');
-                    this.write(outBuffer);
-                    break;
-                case APF_CHANNEL_WINDOW_ADJUST:
-                    var rChannelId = chunk.readUInt32BE(1);
-                    var bytesToAdd = chunk.readUInt32BE(5);
-                    if (this.sockets[rChannelId] != undefined) {
-                        this.sockets[rChannelId].lme.txWindow += bytesToAdd;
-                        if (!this.sockets[rChannelId].bufferedStream.isEmpty() && this.sockets[rChannelId].bufferedStream.isWaiting()) {
-                            this.sockets[rChannelId].bufferedStream.emit('readable');
-                        }
-                    } else {
-                        //console.log('Unknown Recipient ID/' + rChannelId + ' for APF_CHANNEL_WINDOW_ADJUST');
-                    }
-                    break;
-                case APF_CHANNEL_DATA:
-                    var rChannelId = chunk.readUInt32BE(1);
-                    var dataLen = chunk.readUInt32BE(5);
-                    var data = chunk.slice(9, 9 + dataLen);
-                    if (this.sockets[rChannelId] != undefined) {
-                        this.sockets[rChannelId].pendingBytes.push(data.length);
-                        this.sockets[rChannelId].write(data, function () {
-                            var written = this.pendingBytes.shift();
-                            var outBuffer = Buffer.alloc(9);
-                            outBuffer.writeUInt8(APF_CHANNEL_WINDOW_ADJUST, 0);
-                            outBuffer.writeUInt32BE(this.lme.amtId, 1);
-                            outBuffer.writeUInt32BE(written, 5);
-                            this.HECI.write(outBuffer);
-                        });
-                    } else {
-                        //console.log('Unknown Recipient ID/' + rChannelId + ' for APF_CHANNEL_DATA');
-                    }
-                    break;
-                case APF_CHANNEL_CLOSE:
-                    var rChannelId = chunk.readUInt32BE(1);
-                    if (this.sockets[rChannelId] != undefined) {
-                        this.sockets[rChannelId].end();
-                        var amtId = this.sockets[rChannelId].lme.amtId;
-                        var buffer = Buffer.alloc(5);
-                        delete this.sockets[rChannelId];
-                        
-                        buffer.writeUInt8(APF_CHANNEL_CLOSE, 0);
-                        buffer.writeUInt32BE(amtId, 1);
-                        this.write(buffer);
-                    } else {
-                        //console.log('Unknown Recipient ID/' + rChannelId + ' for APF_CHANNEL_CLOSE');
-                    }
-                    break;
-            }
-        });
-    });
-    
-    this.bindDuplexStream = function (duplexStream, remoteFamily, localPort) {
-        var socket = duplexStream;
-        //console.log('New [' + remoteFamily + '] Virtual Connection/' + socket.localPort);
-        socket.pendingBytes = [];
-        socket.HECI = this._LME;
-        socket.LMS = this;
-        socket.lme = new lme_object();
-        socket.lme.Socket = socket;
-        var buffer = new MemoryStream();
-        buffer.writeUInt8(0x5A);
-        buffer.writeUInt32BE(15);
-        buffer.write('forwarded-tcpip');
-        buffer.writeUInt32BE(socket.lme.ourId);
-        buffer.writeUInt32BE(this.INITIAL_RXWINDOW_SIZE);
-        buffer.writeUInt32BE(0xFFFFFFFF);
-        for (var i = 0; i < 2; ++i) {
-            if (remoteFamily == 'IPv6') {
-                buffer.writeUInt32BE(3);
-                buffer.write('::1');
-            } else {
-                buffer.writeUInt32BE(9);
-                buffer.write('127.0.0.1');
-            }
-            buffer.writeUInt32BE(localPort);
-        }
-        this._LME.write(buffer.buffer);
-        if (this._LME.sockets == undefined) { this._LME.sockets = {}; }
-        this._LME.sockets[socket.lme.ourId] = socket;
-        socket.pause();
-    };
-    
-    this._LME.connect(heci.GUIDS.LME, { noPipeline: 0 });
-}
-
-module.exports = lme_heci;
diff --git a/agents/modules_meshcore/WifiScanner.js b/agents/modules_meshcore/WifiScanner.js
deleted file mode 100644
index 40836f7a..00000000
--- a/agents/modules_meshcore/WifiScanner.js
+++ /dev/null
@@ -1,272 +0,0 @@
-var MemoryStream = require('MemoryStream');
-var WindowsWireless = new Buffer([
-0x0A, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x5F, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x77, 0x6C, 0x61, 0x6E,
-0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x45,
-0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x77, 0x6C,
-0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x3D, 0x20,
-0x77, 0x6C, 0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20,
-0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x20, 0x3D, 0x20, 0x77, 0x6C, 0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65,
-0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x35, 0x33, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x61, 0x6D, 0x65, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x31, 0x36, 0x2C, 0x20, 0x35, 0x31, 0x32,
-0x29, 0x2E, 0x41, 0x6E, 0x73, 0x69, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x3B, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x20, 0x28, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61,
-0x6C, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x30, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x4E, 0x4F, 0x54, 0x20, 0x52, 0x45, 0x41, 0x44, 0x59, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x31, 0x3A, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x22, 0x3B, 0x0A,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20,
-0x32, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x44, 0x2D, 0x48, 0x4F, 0x43, 0x22,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73,
-0x65, 0x20, 0x33, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F,
-0x4E, 0x4E, 0x45, 0x43, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x34, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65,
-0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62,
-0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x35, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x53, 0x53, 0x4F, 0x43, 0x49, 0x41, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x36, 0x3A, 0x0A, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F, 0x56, 0x45, 0x52, 0x49, 0x4E, 0x47, 0x22, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65,
-0x20, 0x37, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x55, 0x54, 0x48, 0x45, 0x4E,
-0x54, 0x49, 0x43, 0x41, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74,
-0x65, 0x20, 0x3D, 0x20, 0x22, 0x55, 0x4E, 0x4B, 0x4E, 0x4F, 0x57, 0x4E, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65,
-0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E,
-0x57, 0x6C, 0x61, 0x6E, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20,
-0x30, 0x2C, 0x20, 0x30, 0x29, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E,
-0x20, 0x28, 0x74, 0x72, 0x75, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6C, 0x73, 0x65, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x66, 0x61, 0x6C, 0x73, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x7D, 0x0A, 0x0A, 0x66,
-0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x5F, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x5F, 0x62, 0x73, 0x73, 0x69,
-0x64, 0x2C, 0x20, 0x5F, 0x72, 0x73, 0x73, 0x69, 0x2C, 0x20, 0x5F, 0x6C, 0x71, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D,
-0x20, 0x5F, 0x73, 0x73, 0x69, 0x64, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x5F, 0x62, 0x73, 0x73, 0x69, 0x64, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x72, 0x73, 0x73, 0x69, 0x20, 0x3D, 0x20, 0x5F, 0x72, 0x73, 0x73, 0x69, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73,
-0x2E, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x5F, 0x6C, 0x71, 0x3B, 0x0A, 0x7D, 0x0A, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x2E, 0x70, 0x72, 0x6F, 0x74, 0x6F, 0x74, 0x79,
-0x70, 0x65, 0x2E, 0x74, 0x6F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x20, 0x3D, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x72,
-0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x73, 0x73, 0x69, 0x64, 0x20, 0x2B, 0x20, 0x22, 0x20, 0x5B, 0x22, 0x20, 0x2B, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x62,
-0x73, 0x73, 0x69, 0x64, 0x20, 0x2B, 0x20, 0x22, 0x5D, 0x3A, 0x20, 0x22, 0x20, 0x2B, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x6C, 0x71, 0x29, 0x3B, 0x0A, 0x7D, 0x0A, 0x0A, 0x66, 0x75, 0x6E, 0x63,
-0x74, 0x69, 0x6F, 0x6E, 0x20, 0x4F, 0x6E, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x79, 0x28, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x29, 0x0A,
-0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3D, 0x20, 0x4E,
-0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x43, 0x6F, 0x64, 0x65, 0x20, 0x3D, 0x20, 0x4E, 0x6F, 0x74, 0x69,
-0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x64, 0x61, 0x74, 0x61, 0x47, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74,
-0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x28, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69,
-0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x26, 0x20, 0x30, 0x58, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x38, 0x29, 0x20, 0x26, 0x26, 0x20, 0x28, 0x4E,
-0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x43, 0x6F, 0x64, 0x65, 0x20, 0x3D, 0x3D, 0x20, 0x37, 0x29, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x62, 0x73, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68,
-0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x47, 0x65, 0x74, 0x42,
-0x53, 0x53, 0x4C, 0x69, 0x73, 0x74, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x47,
-0x75, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x33, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x62, 0x73, 0x73, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69,
-0x66, 0x20, 0x28, 0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x74, 0x6F, 0x74, 0x61, 0x6C, 0x53, 0x69, 0x7A, 0x65, 0x20, 0x3D, 0x20, 0x62, 0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28,
-0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76,
-0x61, 0x72, 0x20, 0x6E, 0x75, 0x6D, 0x49, 0x74, 0x65, 0x6D, 0x73, 0x20, 0x3D, 0x20, 0x62, 0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28,
-0x34, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x28, 0x69, 0x20, 0x3D, 0x20,
-0x30, 0x3B, 0x20, 0x69, 0x20, 0x3C, 0x20, 0x6E, 0x75, 0x6D, 0x49, 0x74, 0x65, 0x6D, 0x73, 0x3B, 0x20, 0x2B, 0x2B, 0x69, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x3D, 0x20, 0x62,
-0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x20, 0x2B, 0x20, 0x28, 0x33, 0x36, 0x30, 0x20, 0x2A, 0x20, 0x69, 0x29, 0x2C, 0x20,
-0x33, 0x36, 0x30, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D,
-0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x2C, 0x20, 0x33, 0x32, 0x29, 0x2E, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x2E, 0x74, 0x72, 0x69, 0x6D, 0x28, 0x29,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x74,
-0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x30, 0x2C, 0x20, 0x36, 0x29, 0x2E, 0x48, 0x65, 0x78, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x32, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x73, 0x73, 0x69, 0x20, 0x3D, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65,
-0x66, 0x28, 0x35, 0x36, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-0x72, 0x20, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x36, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x65, 0x6D, 0x69, 0x74, 0x28,
-0x27, 0x53, 0x63, 0x61, 0x6E, 0x27, 0x2C, 0x20, 0x6E, 0x65, 0x77, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x62, 0x73,
-0x73, 0x69, 0x64, 0x2C, 0x20, 0x72, 0x73, 0x73, 0x69, 0x2C, 0x20, 0x6C, 0x71, 0x29, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x7D, 0x0A, 0x0A, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x57, 0x69, 0x72, 0x65,
-0x6C, 0x65, 0x73, 0x73, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x65, 0x6D, 0x69, 0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x20, 0x3D, 0x20,
-0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x65, 0x76, 0x65, 0x6E, 0x74, 0x73, 0x27, 0x29, 0x2E, 0x69, 0x6E, 0x68, 0x65, 0x72, 0x69, 0x74, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x29,
-0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x5F,
-0x47, 0x65, 0x6E, 0x65, 0x72, 0x69, 0x63, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x27, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76,
-0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6F,
-0x78, 0x79, 0x28, 0x22, 0x77, 0x6C, 0x61, 0x6E, 0x61, 0x70, 0x69, 0x2E, 0x64, 0x6C, 0x6C, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69,
-0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x4F, 0x70, 0x65, 0x6E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x22,
-0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28,
-0x22, 0x57, 0x6C, 0x61, 0x6E, 0x47, 0x65, 0x74, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x42, 0x73, 0x73, 0x4C, 0x69, 0x73, 0x74, 0x22, 0x2C, 0x20, 0x22, 0x47, 0x65, 0x74, 0x42, 0x53, 0x53,
-0x4C, 0x69, 0x73, 0x74, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65,
-0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x22, 0x29,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22,
-0x57, 0x6C, 0x61, 0x6E, 0x45, 0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E,
-0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x53, 0x63, 0x61, 0x6E, 0x22, 0x29, 0x3B, 0x0A,
-0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C,
-0x61, 0x6E, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x22, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6E, 0x65, 0x67,
-0x6F, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69,
-0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x68, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C,
-0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69,
-0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x4F, 0x70, 0x65, 0x6E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x28, 0x32, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x6E, 0x65, 0x67, 0x6F, 0x74, 0x69, 0x61, 0x74,
-0x65, 0x64, 0x2C, 0x20, 0x68, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x20, 0x3D, 0x20, 0x68, 0x2E, 0x56, 0x61, 0x6C, 0x3B,
-0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6C, 0x6C, 0x62, 0x61, 0x63, 0x6B, 0x50, 0x72, 0x6F,
-0x78, 0x79, 0x28, 0x4F, 0x6E, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x79, 0x2C, 0x20, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46,
-0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x50, 0x72, 0x65, 0x76, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E,
-0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69,
-0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x58, 0x30, 0x30, 0x30, 0x30, 0x46, 0x46, 0x46, 0x46, 0x2C, 0x20,
-0x30, 0x2C, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x2E, 0x43, 0x61, 0x6C,
-0x6C, 0x62, 0x61, 0x63, 0x6B, 0x2C, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54,
-0x2E, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x50, 0x72, 0x65, 0x76, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6D, 0x69,
-0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x2E, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6E, 0x74, 0x28, 0x27, 0x53, 0x63, 0x61, 0x6E, 0x27, 0x29, 0x3B, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x65, 0x6D, 0x69, 0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x2E, 0x61, 0x64, 0x64, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x27, 0x53, 0x63, 0x61, 0x6E, 0x27,
-0x2C, 0x20, 0x5F, 0x53, 0x63, 0x61, 0x6E, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x47, 0x65, 0x74, 0x43, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x65, 0x64,
-0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x20, 0x3D, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x28, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61,
-0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73,
-0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x45, 0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E,
-0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E,
-0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44,
-0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x35, 0x33, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x61, 0x6D, 0x65, 0x20,
-0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x31, 0x36, 0x2C, 0x20, 0x35, 0x31, 0x32, 0x29, 0x2E, 0x41, 0x6E, 0x73, 0x69, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65,
-0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x28, 0x69, 0x6E,
-0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x20, 0x3D, 0x3D, 0x20, 0x31, 0x29, 0x20, 0x2F, 0x2F,
-0x20, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x76, 0x61, 0x72, 0x20, 0x64, 0x61, 0x74, 0x61, 0x53, 0x69, 0x7A, 0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65,
-0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x70, 0x44,
-0x61, 0x74, 0x61, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72,
-0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x54, 0x79, 0x70, 0x65, 0x20, 0x3D, 0x20,
-0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66,
-0x28, 0x30, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x74, 0x56, 0x61, 0x6C, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65,
-0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x2C, 0x20, 0x37, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x53,
-0x69, 0x7A, 0x65, 0x2C, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2C, 0x20, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x54, 0x79, 0x70, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x72, 0x65, 0x74, 0x56, 0x61, 0x6C, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65,
-0x64, 0x53, 0x53, 0x49, 0x44, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x34, 0x2C,
-0x20, 0x33, 0x32, 0x29, 0x2E, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72,
-0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x36, 0x30,
-0x2C, 0x20, 0x36, 0x29, 0x2E, 0x48, 0x65, 0x78, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x76, 0x61, 0x72, 0x20, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x37, 0x36,
-0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x6E, 0x65, 0x77, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64,
-0x53, 0x53, 0x49, 0x44, 0x2C, 0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x6C, 0x71, 0x29, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x72, 0x6F, 0x77, 0x20, 0x28, 0x22, 0x47, 0x65,
-0x74, 0x43, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x73, 0x3A, 0x20, 0x46, 0x41, 0x49, 0x4C, 0x45, 0x44, 0x20, 0x28, 0x6E, 0x6F, 0x74, 0x20,
-0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x20, 0x6E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x29, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x7D, 0x3B, 0x0A, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x29, 0x3B, 0x0A, 0x7D, 0x0A, 0x0A, 0x6D, 0x6F, 0x64, 0x75, 0x6C,
-0x65, 0x2E, 0x65, 0x78, 0x70, 0x6F, 0x72, 0x74, 0x73, 0x20, 0x3D, 0x20, 0x6E, 0x65, 0x77, 0x20, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x28, 0x29, 0x3B, 0x0A]);
-
-
-
-var WindowsChildScript = new Buffer([
-0x76, 0x61, 0x72, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x43, 0x6F, 0x6E, 0x74,
-0x61, 0x69, 0x6E, 0x65, 0x72, 0x27, 0x29, 0x3B, 0x0D, 0x0A, 0x76, 0x61, 0x72, 0x20, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
-0x28, 0x27, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x27, 0x29, 0x3B, 0x0D, 0x0A, 0x0D, 0x0A, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x2E, 0x6F, 0x6E, 0x28, 0x27, 0x53, 0x63,
-0x61, 0x6E, 0x27, 0x2C, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x28, 0x61, 0x70, 0x29, 0x20, 0x7B, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x73, 0x65, 0x6E, 0x64,
-0x28, 0x61, 0x70, 0x29, 0x3B, 0x20, 0x7D, 0x29, 0x3B, 0x0D, 0x0A, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x2E, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x29, 0x3B, 0x0D, 0x0A]);
-
-
-function AccessPoint(_ssid, _bssid, _lq)
-{
-    this.ssid = _ssid;
-    this.bssid = _bssid;
-    this.lq = _lq;
-}
-AccessPoint.prototype.toString = function ()
-{
-    return ("[" + this.bssid + "]: " + this.ssid + " (" + this.lq + ")");
-    //return (this.ssid + " [" + this.bssid + "]: " + this.lq);
-}
-
-function WiFiScanner()
-{
-    var emitterUtils = require('events').inherits(this);
-    emitterUtils.createEvent('accessPoint');
-
-    this.hasWireless = function ()
-    {
-        var retVal = false;
-        var interfaces = require('os').networkInterfaces();
-        for (var name in interfaces)
-        {
-            if (interfaces[name][0].type == 'wireless') { retVal = true; break; }
-        }
-        return (retVal);
-    };
-
-    this.Scan = function ()
-    {
-        if (process.platform == 'win32')
-        {
-            this.master = require('ScriptContainer').Create(15, ContainerPermissions.DEFAULT);
-            this.master.parent = this;
-            this.master.on('data', function (j) { this.parent.emit('accessPoint', new AccessPoint(j.ssid, j.bssid, j.lq)); });
-
-            this.master.addModule('Wireless', WindowsWireless.toString());
-            this.master.ExecuteString(WindowsChildScript.toString());
-        }
-        else if (process.platform == 'linux')
-        {
-            // Need to get the wireless interface name
-            var interfaces = require('os').networkInterfaces();
-            var wlan = null;
-            for (var i in interfaces)
-            {
-                if (interfaces[i][0].type == 'wireless')
-                {
-                    wlan = i;
-                    break;
-                }
-            }
-            if (wlan != null)
-            {
-                this.child = require('child_process').execFile('/sbin/iwlist', ['iwlist', wlan, 'scan']);
-                this.child.parent = this;
-                this.child.ms = new MemoryStream();
-                this.child.ms.parent = this.child;
-                this.child.stdout.on('data', function (buffer) { this.parent.ms.write(buffer); });
-                this.child.on('exit', function () { this.ms.end(); });
-                this.child.ms.on('end', function ()
-                {
-                    var str = this.buffer.toString();
-                    tokens = str.split(' - Address: ');
-                    for (var block in tokens)
-                    {
-                        if (block == 0) continue;
-                        var ln = tokens[block].split('\n');
-                        var _bssid = ln[0];
-                        var _lq;
-                        var _ssid;
-
-                        for (var lnblock in ln)
-                        {
-                            lnblock = ln[lnblock].trim();
-                            lnblock = lnblock.trim();
-                            if (lnblock.startsWith('ESSID:'))
-                            {
-                                _ssid = lnblock.slice(7, lnblock.length - 1);
-                                if (_ssid == '<hidden>') { _ssid = ''; }
-                            }
-                            if (lnblock.startsWith('Signal level='))
-                            {
-                                _lq = lnblock.slice(13,lnblock.length-4);
-                            }
-                            else if (lnblock.startsWith('Quality='))
-                            {
-                                _lq = lnblock.slice(8, 10);
-                                var scale = lnblock.slice(11, 13);
-                            }
-                        }
-                        this.parent.parent.emit('accessPoint', new AccessPoint(_ssid, _bssid, _lq));
-                    }
-                });
-            }
-        }
-    }
-}
-
-module.exports = WiFiScanner;
-
-
-
-
-
-
-
diff --git a/agents/modules_meshcore/amt_heci.js b/agents/modules_meshcore/amt_heci.js
deleted file mode 100644
index 970e0271..00000000
--- a/agents/modules_meshcore/amt_heci.js
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-Copyright 2018 Intel Corporation
-
-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.
-*/
-
-var Q = require('queue');
-
-function amt_heci() {
-    var emitterUtils = require('events').inherits(this);
-    emitterUtils.createEvent('error');
-    emitterUtils.createEvent('connect');
-
-    var heci = require('heci');
-
-    this._amt = heci.create();
-    this._amt.BiosVersionLen = 65;
-    this._amt.UnicodeStringLen = 20;
-
-    this._amt.rq = new Q();
-    this._amt.Parent = this;
-    this._amt.on('error', function (e) { this.Parent.emit('error', e); });
-    this._amt.on('connect', function () {
-        this.Parent.emit('connect');
-        this.on('data', function (chunk) {
-            //console.log("Received: " + chunk.length + " bytes");
-            var header = this.Parent.getCommand(chunk);
-            //console.log("CMD = " + header.Command + " (Status: " + header.Status + ") Response = " + header.IsResponse);
-
-            var user = this.rq.deQueue();
-            var params = user.optional;
-            var callback = user.func;
-
-            params.unshift(header);
-            callback.apply(this.Parent, params);
-        });
-    });
-    this._amt.connect(heci.GUIDS.AMT, { noPipeline: 1 });
-
-    this.getCommand = function (chunk) {
-        var command = chunk.length == 0 ? (this._amt.rq.peekQueue().cmd | 0x800000) : chunk.readUInt32LE(4);
-        var ret = { IsResponse: (command & 0x800000) == 0x800000 ? true : false, Command: (command & 0x7FFFFF), Status: chunk.length != 0 ? chunk.readUInt32LE(12) : -1, Data: chunk.length != 0 ? chunk.slice(16) : null };
-        return (ret);
-    };
-
-    this.sendCommand = function () {
-        if (arguments.length < 3 || typeof (arguments[0]) != 'number' || typeof (arguments[1]) != 'object' || typeof (arguments[2]) != 'function') { throw ('invalid parameters'); }
-        var args = [];
-        for (var i = 3; i < arguments.length; ++i) { args.push(arguments[i]); }
-
-        this._amt.rq.enQueue({ cmd: arguments[0], func: arguments[2], optional: args });
-
-        var header = Buffer.from('010100000000000000000000', 'hex');
-        header.writeUInt32LE(arguments[0] | 0x04000000, 4);
-        header.writeUInt32LE(arguments[1] == null ? 0 : arguments[1].length, 8);
-
-        this._amt.write(arguments[1] == null ? header : Buffer.concat([header, arguments[1]]));
-    }
-
-    this.getVersion = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(26, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var i, CodeVersion = header.Data, val = { BiosVersion: CodeVersion.slice(0, this._amt.BiosVersionLen), Versions: [] }, v = CodeVersion.slice(this._amt.BiosVersionLen + 4);
-                for (i = 0; i < CodeVersion.readUInt32LE(this._amt.BiosVersionLen) ; ++i) {
-                    val.Versions[i] = { Description: v.slice(2, v.readUInt16LE(0) + 2).toString(), Version: v.slice(4 + this._amt.UnicodeStringLen, 4 + this._amt.UnicodeStringLen + v.readUInt16LE(2 + this._amt.UnicodeStringLen)).toString() };
-                    v = v.slice(4 + (2 * this._amt.UnicodeStringLen));
-                }
-                opt.unshift(val);
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-
-    this.getProvisioningState = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(17, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var result = {};
-                result.state = header.Data.readUInt32LE(0);
-                if (result.state < 3) { result.stateStr = ["PRE", "IN", "POST"][result.state]; }
-                opt.unshift(result);
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getProvisioningMode = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(8, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var result = {};
-                result.mode = header.Data.readUInt32LE(0);
-                if (result.mode < 4) { result.modeStr = ["NONE", "ENTERPRISE", "SMALL_BUSINESS", "REMOTE_ASSISTANCE"][result.mode]; }
-                result.legacy = header.Data.readUInt32LE(4) == 0 ? false : true;
-                opt.unshift(result);
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getEHBCState = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(132, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                opt.unshift({ EHBC: header.Data.readUInt32LE(0) != 0 });
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getControlMode = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(107, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var result = {};
-                result.controlMode = header.Data.readUInt32LE(0);
-                if (result.controlMode < 3) { result.controlModeStr = ["NONE_RPAT", "CLIENT", "ADMIN", "REMOTE_ASSISTANCE"][result.controlMode]; }
-                opt.unshift(result);
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getMACAddresses = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(37, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                opt.unshift({ DedicatedMAC: header.Data.slice(0, 6).toString('hex:'), HostMAC: header.Data.slice(6, 12).toString('hex:') });
-            } else { opt.unshift({ DedicatedMAC: null, HostMAC: null }); }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getDnsSuffix = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(54, null, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var resultLen = header.Data.readUInt16LE(0);
-                if (resultLen > 0) { opt.unshift(header.Data.slice(2, 2 + resultLen).toString()); } else { opt.unshift(null); }
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getHashHandles = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x2C, null, function (header, fn, opt) {
-            var result = [];
-            if (header.Status == 0) {
-                var resultLen = header.Data.readUInt32LE(0);
-                for (var i = 0; i < resultLen; ++i) {
-                    result.push(header.Data.readUInt32LE(4 + (4 * i)));
-                }
-            }
-            opt.unshift(result);
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getCertHashEntry = function (handle, callback) {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-
-        var data = new Buffer(4);
-        data.writeUInt32LE(handle, 0);
-
-        this.sendCommand(0x2D, data, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var result = {};
-                result.isDefault = header.Data.readUInt32LE(0);
-                result.isActive = header.Data.readUInt32LE(4);
-                result.hashAlgorithm = header.Data.readUInt8(72);
-                if (result.hashAlgorithm < 4) {
-                    result.hashAlgorithmStr = ["MD5", "SHA1", "SHA256", "SHA512"][result.hashAlgorithm];
-                    result.hashAlgorithmSize = [16, 20, 32, 64][result.hashAlgorithm];
-                    result.certificateHash = header.Data.slice(8, 8 + result.hashAlgorithmSize).toString('hex');
-                }
-                result.name = header.Data.slice(73 + 2, 73 + 2 + header.Data.readUInt16LE(73)).toString();
-                opt.unshift(result);
-            } else {
-                opt.unshift(null);
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    };
-    this.getCertHashEntries = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-
-        this.getHashHandles(function (handles, fn, opt) {
-            var entries = [];
-            this.getCertHashEntry(handles.shift(), this._getHashEntrySink, fn, opt, entries, handles);
-        }, callback, optional);
-    };
-    this._getHashEntrySink = function (result, fn, opt, entries, handles) {
-        entries.push(result);
-        if (handles.length > 0) {
-            this.getCertHashEntry(handles.shift(), this._getHashEntrySink, fn, opt, entries, handles);
-        } else {
-            opt.unshift(entries);
-            fn.apply(this, opt);
-        }
-    }
-    this.getLocalSystemAccount = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(103, Buffer.alloc(40), function (header, fn, opt) {
-            if (header.Data.length == 68) { opt.unshift({ user: header.Data.slice(0, 34).toString(), pass: header.Data.slice(34, 67).toString(), raw: header.Data }); } else { opt.unshift(null); }
-            fn.apply(this, opt);
-        }, callback, optional);
-    }
-    this.unprovision = function (mode, callback) {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        var data = new Buffer(4);
-        data.writeUInt32LE(mode, 0);
-        this.sendCommand(16, data, function (header, fn, opt) {
-            opt.unshift(header.Status);
-            fn.apply(this, opt);
-        }, callback, optional);
-    }
-    this.startConfiguration = function () {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x29, data, function (header, fn, opt) { opt.unshift(header.Status); fn.apply(this, opt); }, callback, optional);
-    }
-    this.stopConfiguration = function () {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x5E, data, function (header, fn, opt) { opt.unshift(header.Status); fn.apply(this, opt); }, callback, optional);
-    }
-    this.openUserInitiatedConnection = function () {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x44, data, function (header, fn, opt) { opt.unshift(header.Status); fn.apply(this, opt); }, callback, optional);
-    }
-    this.closeUserInitiatedConnection = function () {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x45, data, function (header, fn, opt) { opt.unshift(header.Status); fn.apply(this, opt); }, callback, optional);
-    }
-    this.getRemoteAccessConnectionStatus = function () {
-        var optional = [];
-        for (var i = 2; i < arguments.length; ++i) { optional.push(arguments[i]); }
-        this.sendCommand(0x46, data, function (header, fn, opt) {
-            if (header.Status == 0) {
-                var hostname = v.slice(14, header.Data.readUInt16LE(12) + 14).toString()
-                opt.unshift({ status: header.Status, networkStatus: header.Data.readUInt32LE(0), remoteAccessStatus: header.Data.readUInt32LE(4), remoteAccessTrigger: header.Data.readUInt32LE(8), mpsHostname: hostname, raw: header.Data });
-            } else {
-                opt.unshift({ status: header.Status });
-            }
-            fn.apply(this, opt);
-        }, callback, optional);
-    }
-    this.getProtocolVersion = function (callback) {
-        var optional = [];
-        for (var i = 1; i < arguments.length; ++i) { opt.push(arguments[i]); }
-
-        heci.doIoctl(heci.IOCTL.HECI_VERSION, Buffer.alloc(5), Buffer.alloc(5), function (status, buffer, self, fn, opt) {
-            if (status == 0) {
-                var result = buffer.readUInt8(0).toString() + '.' + buffer.readUInt8(1).toString() + '.' + buffer.readUInt8(2).toString() + '.' + buffer.readUInt16BE(3).toString();
-                opt.unshift(result);
-                fn.apply(self, opt);
-            }
-            else {
-                opt.unshift(null);
-                fn.apply(self, opt);
-            }
-        }, this, callback, optional);
-    }
-}
-
-module.exports = amt_heci;
\ No newline at end of file
diff --git a/agents/modules_meshcore/lme_heci.js b/agents/modules_meshcore/lme_heci.js
deleted file mode 100644
index 011e17e1..00000000
--- a/agents/modules_meshcore/lme_heci.js
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
-Copyright 2018 Intel Corporation
-
-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.
-*/
-
-var MemoryStream = require('MemoryStream');
-var lme_id = 0;
-var lme_port_offset = 0; // Debug: Set this to "-100" to bind to 16892 & 16893 and IN_ADDRANY. This is for LMS debugging.
-
-
-var APF_DISCONNECT = 1;
-var APF_SERVICE_REQUEST = 5;
-var APF_SERVICE_ACCEPT = 6;
-var APF_USERAUTH_REQUEST = 50;
-var APF_USERAUTH_FAILURE = 51;
-var APF_USERAUTH_SUCCESS = 52;
-var APF_GLOBAL_REQUEST = 80;
-var APF_REQUEST_SUCCESS = 81;
-var APF_REQUEST_FAILURE = 82;
-var APF_CHANNEL_OPEN = 90;
-var APF_CHANNEL_OPEN_CONFIRMATION = 91;
-var APF_CHANNEL_OPEN_FAILURE = 92;
-var APF_CHANNEL_WINDOW_ADJUST = 93;
-var APF_CHANNEL_DATA = 94;
-var APF_CHANNEL_CLOSE = 97;
-var APF_PROTOCOLVERSION = 192;
-
-
-function lme_object() {
-    this.ourId = ++lme_id;
-    this.amtId = -1;
-    this.LME_CHANNEL_STATUS = 'LME_CS_FREE';
-    this.txWindow = 0;
-    this.rxWindow = 0;
-    this.localPort = 0;
-    this.errorCount = 0;
-}
-
-function stream_bufferedWrite() {
-    var emitterUtils = require('events').inherits(this);
-    this.buffer = [];
-    this._readCheckImmediate = undefined;
-    
-    // Writable Events
-    emitterUtils.createEvent('close');
-    emitterUtils.createEvent('drain');
-    emitterUtils.createEvent('error');
-    emitterUtils.createEvent('finish');
-    emitterUtils.createEvent('pipe');
-    emitterUtils.createEvent('unpipe');
-    
-    // Readable Events
-    emitterUtils.createEvent('readable');
-    this.isEmpty = function () {
-        return (this.buffer.length == 0);
-    };
-    this.isWaiting = function () {
-        return (this._readCheckImmediate == undefined);
-    };
-    this.write = function (chunk) {
-        for (var args in arguments) { if (typeof (arguments[args]) == 'function') { this.once('drain', arguments[args]); break; } }
-        var tmp = Buffer.alloc(chunk.length);
-        chunk.copy(tmp);
-        this.buffer.push({ offset: 0, data: tmp });
-        this.emit('readable');
-        return (this.buffer.length == 0 ? true : false);
-    };
-    this.read = function () {
-        var size = arguments.length == 0 ? undefined : arguments[0];
-        var bytesRead = 0;
-        var list = [];
-        while ((size == undefined || bytesRead < size) && this.buffer.length > 0) {
-            var len = this.buffer[0].data.length - this.buffer[0].offset;
-            var offset = this.buffer[0].offset;
-            
-            if (len > (size - bytesRead)) {
-                // Only reading a subset
-                list.push(this.buffer[0].data.slice(offset, offset + size - bytesRead));
-                this.buffer[0].offset += (size - bytesRead);
-                bytesRead += (size - bytesRead);
-            } else {
-                // Reading the entire thing
-                list.push(this.buffer[0].data.slice(offset));
-                bytesRead += len;
-                this.buffer.shift();
-            }
-        }
-        this._readCheckImmediate = setImmediate(function (buffered) {
-            buffered._readCheckImmediate = undefined;
-            if (buffered.buffer.length == 0) {
-                buffered.emit('drain'); // Drained
-            } else {
-                buffered.emit('readable'); // Not drained
-            }
-        }, this);
-        return (Buffer.concat(list));
-    };
-}
-
-
-function lme_heci(options) {
-    var emitterUtils = require('events').inherits(this);
-    emitterUtils.createEvent('error');
-    emitterUtils.createEvent('connect');
-    
-    if (options.debug == true) { lme_port_offset = -100; } // LMS debug mode
-
-    var heci = require('heci');
-    this.INITIAL_RXWINDOW_SIZE = 4096;
-    
-    this._LME = heci.create();
-    this._LME.LMS = this;
-    this._LME.on('error', function (e) { this.LMS.emit('error', e); });
-    this._LME.on('connect', function () {
-        this.LMS.emit('connect');
-        this.on('data', function (chunk) {
-            // this = HECI
-            var cmd = chunk.readUInt8(0);
-            
-            switch (cmd) {
-                default:
-                    //console.log('Received ' + chunk.length + ' bytes of data for LMS');
-                    //console.log('Command = ' + cmd);
-                    break;
-                case APF_SERVICE_REQUEST:
-                    var nameLen = chunk.readUInt32BE(1);
-                    var name = chunk.slice(5, nameLen + 5);
-                    //console.log("Service Request for: " + name);
-                    if (name == 'pfwd@amt.intel.com' || name == 'auth@amt.intel.com') {
-                        var outBuffer = Buffer.alloc(5 + nameLen);
-                        outBuffer.writeUInt8(6, 0);
-                        outBuffer.writeUInt32BE(nameLen, 1);
-                        outBuffer.write(name.toString(), 5);
-                        this.write(outBuffer);
-                        //console.log('Answering APF_SERVICE_REQUEST');
-                    } else {
-                        //console.log('UNKNOWN APF_SERVICE_REQUEST');
-                    }
-                    break;
-                case APF_GLOBAL_REQUEST:
-                    var nameLen = chunk.readUInt32BE(1);
-                    var name = chunk.slice(5, nameLen + 5).toString();
-                    
-                    switch (name) {
-                        case 'tcpip-forward':
-                            var len = chunk.readUInt32BE(nameLen + 6);
-                            var port = chunk.readUInt32BE(nameLen + 10 + len);
-                            //console.log("[" + chunk.length + "/" + len + "] APF_GLOBAL_REQUEST for: " + name + " on port " + port);
-                            if (this[name] == undefined) {
-                                this[name] = {};
-                            }
-                            this[name][port] = require('net').createServer();
-                            this[name][port].HECI = this;
-                            if (lme_port_offset == 0) {
-                                this[name][port].listen({ port: port, host: '127.0.0.1' }); // Normal mode
-                            } else {
-                                this[name][port].listen({ port: (port + lme_port_offset) }); // Debug mode
-                            }
-                            this[name][port].on('connection', function (socket) {
-                                //console.log('New [' + socket.remoteFamily + '] TCP Connection on: ' + socket.remoteAddress + ' :' + socket.localPort);
-                                this.HECI.LMS.bindDuplexStream(socket, socket.remoteFamily, socket.localPort - lme_port_offset);
-                            });
-                            var outBuffer = Buffer.alloc(5);
-                            outBuffer.writeUInt8(81, 0);
-                            outBuffer.writeUInt32BE(port, 1);
-                            this.write(outBuffer);
-                            break;
-                        case 'cancel-tcpip-forward':
-                            break;
-                        case 'udp-send-to@amt.intel.com':
-                            break;
-                        default:
-                            //console.log("Unknown APF_GLOBAL_REQUEST for: " + name);
-                            break;
-                    }
-                    break;
-                case APF_CHANNEL_OPEN_CONFIRMATION:
-                    var rChannel = chunk.readUInt32BE(1);
-                    var sChannel = chunk.readUInt32BE(5);
-                    var wSize = chunk.readUInt32BE(9);
-                    //console.log('rChannel/' + rChannel + ', sChannel/' + sChannel + ', wSize/' + wSize);
-                    if (this.sockets[rChannel] != undefined) {
-                        this.sockets[rChannel].lme.amtId = sChannel;
-                        this.sockets[rChannel].lme.rxWindow = wSize;
-                        this.sockets[rChannel].lme.txWindow = wSize;
-                        this.sockets[rChannel].lme.LME_CHANNEL_STATUS = 'LME_CS_CONNECTED';
-                        //console.log('LME_CS_CONNECTED');
-                        this.sockets[rChannel].bufferedStream = new stream_bufferedWrite();
-                        this.sockets[rChannel].bufferedStream.socket = this.sockets[rChannel];
-                        this.sockets[rChannel].bufferedStream.on('readable', function () {
-                            if (this.socket.lme.txWindow > 0) {
-                                var buffer = this.read(this.socket.lme.txWindow);
-                                var packet = Buffer.alloc(9 + buffer.length);
-                                packet.writeUInt8(APF_CHANNEL_DATA, 0);
-                                packet.writeUInt32BE(this.socket.lme.amtId, 1);
-                                packet.writeUInt32BE(buffer.length, 5);
-                                buffer.copy(packet, 9);
-                                this.socket.lme.txWindow -= buffer.length;
-                                this.socket.HECI.write(packet);
-                            }
-                        });
-                        this.sockets[rChannel].bufferedStream.on('drain', function () {
-                            this.socket.resume();
-                        });
-                        this.sockets[rChannel].on('data', function (chunk) {
-                            if (!this.bufferedStream.write(chunk)) { this.pause(); }
-                        });
-                        this.sockets[rChannel].on('end', function () {
-                            var outBuffer = Buffer.alloc(5);
-                            outBuffer.writeUInt8(APF_CHANNEL_CLOSE, 0);
-                            outBuffer.writeUInt32BE(this.lme.amtId, 1);
-                            this.HECI.write(outBuffer);
-                        });
-                        this.sockets[rChannel].resume();
-                    }
-                    
-                    break;
-                case APF_PROTOCOLVERSION:
-                    var major = chunk.readUInt32BE(1);
-                    var minor = chunk.readUInt32BE(5);
-                    var reason = chunk.readUInt32BE(9);
-                    var outBuffer = Buffer.alloc(93);
-                    outBuffer.writeUInt8(192, 0);
-                    outBuffer.writeUInt32BE(1, 1);
-                    outBuffer.writeUInt32BE(0, 5);
-                    outBuffer.writeUInt32BE(reason, 9);
-                    //console.log('Answering PROTOCOL_VERSION');
-                    this.write(outBuffer);
-                    break;
-                case APF_CHANNEL_WINDOW_ADJUST:
-                    var rChannelId = chunk.readUInt32BE(1);
-                    var bytesToAdd = chunk.readUInt32BE(5);
-                    if (this.sockets[rChannelId] != undefined) {
-                        this.sockets[rChannelId].lme.txWindow += bytesToAdd;
-                        if (!this.sockets[rChannelId].bufferedStream.isEmpty() && this.sockets[rChannelId].bufferedStream.isWaiting()) {
-                            this.sockets[rChannelId].bufferedStream.emit('readable');
-                        }
-                    } else {
-                        //console.log('Unknown Recipient ID/' + rChannelId + ' for APF_CHANNEL_WINDOW_ADJUST');
-                    }
-                    break;
-                case APF_CHANNEL_DATA:
-                    var rChannelId = chunk.readUInt32BE(1);
-                    var dataLen = chunk.readUInt32BE(5);
-                    var data = chunk.slice(9, 9 + dataLen);
-                    if (this.sockets[rChannelId] != undefined) {
-                        this.sockets[rChannelId].pendingBytes.push(data.length);
-                        this.sockets[rChannelId].write(data, function () {
-                            var written = this.pendingBytes.shift();
-                            var outBuffer = Buffer.alloc(9);
-                            outBuffer.writeUInt8(APF_CHANNEL_WINDOW_ADJUST, 0);
-                            outBuffer.writeUInt32BE(this.lme.amtId, 1);
-                            outBuffer.writeUInt32BE(written, 5);
-                            this.HECI.write(outBuffer);
-                        });
-                    } else {
-                        //console.log('Unknown Recipient ID/' + rChannelId + ' for APF_CHANNEL_DATA');
-                    }
-                    break;
-                case APF_CHANNEL_CLOSE:
-                    var rChannelId = chunk.readUInt32BE(1);
-                    if (this.sockets[rChannelId] != undefined) {
-                        this.sockets[rChannelId].end();
-                        var amtId = this.sockets[rChannelId].lme.amtId;
-                        var buffer = Buffer.alloc(5);
-                        delete this.sockets[rChannelId];
-                        
-                        buffer.writeUInt8(APF_CHANNEL_CLOSE, 0);
-                        buffer.writeUInt32BE(amtId, 1);
-                        this.write(buffer);
-                    } else {
-                        //console.log('Unknown Recipient ID/' + rChannelId + ' for APF_CHANNEL_CLOSE');
-                    }
-                    break;
-            }
-        });
-    });
-    
-    this.bindDuplexStream = function (duplexStream, remoteFamily, localPort) {
-        var socket = duplexStream;
-        //console.log('New [' + remoteFamily + '] Virtual Connection/' + socket.localPort);
-        socket.pendingBytes = [];
-        socket.HECI = this._LME;
-        socket.LMS = this;
-        socket.lme = new lme_object();
-        socket.lme.Socket = socket;
-        var buffer = new MemoryStream();
-        buffer.writeUInt8(0x5A);
-        buffer.writeUInt32BE(15);
-        buffer.write('forwarded-tcpip');
-        buffer.writeUInt32BE(socket.lme.ourId);
-        buffer.writeUInt32BE(this.INITIAL_RXWINDOW_SIZE);
-        buffer.writeUInt32BE(0xFFFFFFFF);
-        for (var i = 0; i < 2; ++i) {
-            if (remoteFamily == 'IPv6') {
-                buffer.writeUInt32BE(3);
-                buffer.write('::1');
-            } else {
-                buffer.writeUInt32BE(9);
-                buffer.write('127.0.0.1');
-            }
-            buffer.writeUInt32BE(localPort);
-        }
-        this._LME.write(buffer.buffer);
-        if (this._LME.sockets == undefined) { this._LME.sockets = {}; }
-        this._LME.sockets[socket.lme.ourId] = socket;
-        socket.pause();
-    };
-    
-    this._LME.connect(heci.GUIDS.LME, { noPipeline: 0 });
-}
-
-module.exports = lme_heci;
diff --git a/agents/webapppush.js b/agents/webapppush.js
deleted file mode 100644
index 4e076ce1..00000000
--- a/agents/webapppush.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-Copyright 2017 Intel Corporation
-
-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.
-*/
-
-
-// Polyfill String.endsWith
-if (!String.prototype.endsWith) {
-    String.prototype.endsWith = function (searchString, position) {
-        var subjectString = this.toString();
-        if (typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > subjectString.length) { position = subjectString.length; }
-        position -= searchString.length;
-        var lastIndex = subjectString.lastIndexOf(searchString, position);
-        return lastIndex !== -1 && lastIndex === position;
-    };
-}
-
-// Replace a string with a number if the string is an exact number
-function toNumberIfNumber(x) { if ((typeof x == 'string') && (+parseInt(x) == x)) { x = parseInt(x); } return x; }
-
-// Convert decimal to hex
-function char2hex(i) { return (i + 0x100).toString(16).substr(-2).toUpperCase(); }
-
-// Convert a raw string to a hex string
-function rstr2hex(input) { var r = '', i; for (i = 0; i < input.length; i++) { r += char2hex(input.charCodeAt(i)); } return r; }
-
-// Convert a buffer into a string
-function buf2rstr(buf) { var r = ''; for (var i = 0; i < buf.length; i++) { r += String.fromCharCode(buf[i]); } return r; }
-
-// Convert a hex string to a raw string // TODO: Do this using Buffer(), will be MUCH faster
-function hex2rstr(d) {
-    if (typeof d != "string" || d.length == 0) return '';
-    var r = '', m = ('' + d).match(/../g), t;
-    while (t = m.shift()) r += String.fromCharCode('0x' + t);
-    return r
-}
-
-// Convert an object to string with all functions
-function objToString(x, p, ret) {
-    if (ret == undefined) ret = '';
-    if (p == undefined) p = 0;
-    if (x == null) { return '[null]'; }
-    if (p > 8) { return '[...]'; }
-    if (x == undefined) { return '[undefined]'; }
-    if (typeof x == 'string') { if (p == 0) return x; return '"' + x + '"'; }
-    if (typeof x == 'buffer') { return '[buffer]'; }
-    if (typeof x != 'object') { return x; }
-    var r = '{' + (ret ? '\r\n' : ' ');
-    for (var i in x) { r += (addPad(p + 2, ret) + i + ': ' + objToString(x[i], p + 2, ret) + (ret ? '\r\n' : ' ')); }
-    return r + addPad(p, ret) + '}';
-}
-
-// Return p number of spaces 
-function addPad(p, ret) { var r = ''; for (var i = 0; i < p; i++) { r += ret; } return r; }
-
-// Split a string taking into account the quoats. Used for command line parsing
-function splitArgs(str) {
-    var myArray = [], myRegexp = /[^\s"]+|"([^"]*)"/gi;
-    do { var match = myRegexp.exec(str); if (match != null) { myArray.push(match[1] ? match[1] : match[0]); } } while (match != null);
-    return myArray;
-}
-
-// Parse arguments string array into an object
-function parseArgs(argv) {
-    var results = { '_': [] }, current = null;
-    for (var i = 1, len = argv.length; i < len; i++) {
-        var x = argv[i];
-        if (x.length > 2 && x[0] == '-' && x[1] == '-') {
-            if (current != null) { results[current] = true; }
-            current = x.substring(2);
-        } else {
-            if (current != null) { results[current] = toNumberIfNumber(x); current = null; } else { results['_'].push(toNumberIfNumber(x)); }
-        }
-    }
-    if (current != null) { results[current] = true; }
-    return results;
-}
-
-// Parge a URL string into an options object
-function parseUrl(url) {
-    var x = url.split('/');
-    if (x.length < 4) return null;
-    var y = x[2].split(':');
-    var options = {};
-    var options = { protocol: x[0], hostname: y[0], path: '/' + x.splice(3).join('/') };
-    if (y.length == 1) { options.port = ((x[0] == 'https:') || (x[0] == 'wss:')) ? 443 : 80; } else { options.port = parseInt(y[1]); }
-    if (isNaN(options.port) == true) return null;
-    return options;
-}
-
-// Read a entire file into a buffer
-function readFileToBuffer(filePath) {
-    try {
-        var fs = require('fs');
-        var stats = fs.statSync(filePath);
-        if (stats == null) { return null; }
-        var fileData = new Buffer(stats.size);
-        var fd = fs.openSync(filePath, 'r');
-        fs.readSync(fd, fileData, 0, stats.size, 0);
-        fs.closeSync(fd);
-        return fileData;
-    } catch (e) { return null; }
-}
-
-// Performs an HTTP get on a URL and return the data back
-function makeHttpGetRequest(url, func) {
-    var http = require('http');
-    var request = http.get(url, function (res) {
-        var htmlData = '';
-        res.on('data', function (d) { htmlData += d; });
-        res.on('end', function (d) { func(res.statusCode, htmlData); });
-    }).on('error', function (e) { func(0, null); });
-}
-
-// Performs an HTTP get on a URL and return the data back (Alternative implementation)
-function makeHttpGetRequest2(url, func) {
-    var http = require('http');
-    var options = http.parseUri(url);
-    options.username = 'admin';
-    options.password = 'P@ssw0rd';
-    var request = http.request(options, function (res) {
-        var htmlData = '';
-        res.on('data', function (d) { htmlData += d; });
-        res.on('end', function () { func(res.statusCode, htmlData); });
-    });
-    request.on('error', function (e) { func(0, null); });
-    request.end();
-}
-
-// Performs an HTTP get on a URL and return the data back (Alternative implementation)
-function intelAmtSetStorage(url, buffer, func) {
-    var http = require('http');
-    var options = http.parseUri(url);
-    options.user = 'admin'; // TODO: Does not support HTTP digest auth yet!!!!!!!!!!!!!!!!
-    options.pass = 'P@ssw0rd';
-    var request = http.request(options, function (res) {
-        var htmlData = '';
-        res.on('data', function (d) { htmlData += d; });
-        res.on('end', function () { func(res.statusCode, htmlData); });
-    });
-    request.on('error', function (e) { func(0, null); });
-    request.end();
-}
-
-//console.log(objToString(db2, 2, ' '));
-
-console.log('--- Start ---');
-
-var fileData = readFileToBuffer('MeshCommander-Small.gz');
-if (fileData != null) {
-    makeHttpGetRequest2('http://192.168.2.105:16992/index.htm', function (status, htmlData) { console.log(status, htmlData); });
-
-    /*
-    intelAmtSetStorage('http://192.168.2.105:16992/amt-storage/index.htm', fileData, function (status, htmlData) {
-        console.log('intelAmtSetStorage', status, htmlData);
-    });
-    */
-}
-
-console.log('--- End ---');
-//process.exit(2);
\ No newline at end of file
diff --git a/agents/xmodules/WifiScanner.js b/agents/xmodules/WifiScanner.js
deleted file mode 100644
index 07e1c173..00000000
--- a/agents/xmodules/WifiScanner.js
+++ /dev/null
@@ -1,266 +0,0 @@
-var MemoryStream = require('MemoryStream');
-var WindowsWireless = new Buffer([
-0x0A, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x5F, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x77, 0x6C, 0x61, 0x6E,
-0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x45,
-0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x77, 0x6C,
-0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x3D, 0x20,
-0x77, 0x6C, 0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20,
-0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x20, 0x3D, 0x20, 0x77, 0x6C, 0x61, 0x6E, 0x49, 0x6E, 0x74, 0x65,
-0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x35, 0x33, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x61, 0x6D, 0x65, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x31, 0x36, 0x2C, 0x20, 0x35, 0x31, 0x32,
-0x29, 0x2E, 0x41, 0x6E, 0x73, 0x69, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x3B, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x20, 0x28, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61,
-0x6C, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x30, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x4E, 0x4F, 0x54, 0x20, 0x52, 0x45, 0x41, 0x44, 0x59, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x31, 0x3A, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x22, 0x3B, 0x0A,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20,
-0x32, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x44, 0x2D, 0x48, 0x4F, 0x43, 0x22,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73,
-0x65, 0x20, 0x33, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F,
-0x4E, 0x4E, 0x45, 0x43, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x34, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65,
-0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62,
-0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x35, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x53, 0x53, 0x4F, 0x43, 0x49, 0x41, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x36, 0x3A, 0x0A, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x44, 0x49, 0x53, 0x43, 0x4F, 0x56, 0x45, 0x52, 0x49, 0x4E, 0x47, 0x22, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65,
-0x20, 0x37, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x22, 0x41, 0x55, 0x54, 0x48, 0x45, 0x4E,
-0x54, 0x49, 0x43, 0x41, 0x54, 0x49, 0x4E, 0x47, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x3A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74,
-0x65, 0x20, 0x3D, 0x20, 0x22, 0x55, 0x4E, 0x4B, 0x4E, 0x4F, 0x57, 0x4E, 0x22, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6B,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65,
-0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E,
-0x57, 0x6C, 0x61, 0x6E, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20,
-0x30, 0x2C, 0x20, 0x30, 0x29, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E,
-0x20, 0x28, 0x74, 0x72, 0x75, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6C, 0x73, 0x65, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x66, 0x61, 0x6C, 0x73, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x7D, 0x0A, 0x0A, 0x66,
-0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x5F, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x5F, 0x62, 0x73, 0x73, 0x69,
-0x64, 0x2C, 0x20, 0x5F, 0x72, 0x73, 0x73, 0x69, 0x2C, 0x20, 0x5F, 0x6C, 0x71, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D,
-0x20, 0x5F, 0x73, 0x73, 0x69, 0x64, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x5F, 0x62, 0x73, 0x73, 0x69, 0x64, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x72, 0x73, 0x73, 0x69, 0x20, 0x3D, 0x20, 0x5F, 0x72, 0x73, 0x73, 0x69, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73,
-0x2E, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x5F, 0x6C, 0x71, 0x3B, 0x0A, 0x7D, 0x0A, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x2E, 0x70, 0x72, 0x6F, 0x74, 0x6F, 0x74, 0x79,
-0x70, 0x65, 0x2E, 0x74, 0x6F, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x20, 0x3D, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x72,
-0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x73, 0x73, 0x69, 0x64, 0x20, 0x2B, 0x20, 0x22, 0x20, 0x5B, 0x22, 0x20, 0x2B, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x62,
-0x73, 0x73, 0x69, 0x64, 0x20, 0x2B, 0x20, 0x22, 0x5D, 0x3A, 0x20, 0x22, 0x20, 0x2B, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x6C, 0x71, 0x29, 0x3B, 0x0A, 0x7D, 0x0A, 0x0A, 0x66, 0x75, 0x6E, 0x63,
-0x74, 0x69, 0x6F, 0x6E, 0x20, 0x4F, 0x6E, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x79, 0x28, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x29, 0x0A,
-0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3D, 0x20, 0x4E,
-0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x43, 0x6F, 0x64, 0x65, 0x20, 0x3D, 0x20, 0x4E, 0x6F, 0x74, 0x69,
-0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x64, 0x61, 0x74, 0x61, 0x47, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x44, 0x61, 0x74,
-0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x28, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69,
-0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x26, 0x20, 0x30, 0x58, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x38, 0x29, 0x20, 0x26, 0x26, 0x20, 0x28, 0x4E,
-0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x43, 0x6F, 0x64, 0x65, 0x20, 0x3D, 0x3D, 0x20, 0x37, 0x29, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x62, 0x73, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68,
-0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x47, 0x65, 0x74, 0x42,
-0x53, 0x53, 0x4C, 0x69, 0x73, 0x74, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x47,
-0x75, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x33, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x62, 0x73, 0x73, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69,
-0x66, 0x20, 0x28, 0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x74, 0x6F, 0x74, 0x61, 0x6C, 0x53, 0x69, 0x7A, 0x65, 0x20, 0x3D, 0x20, 0x62, 0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28,
-0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76,
-0x61, 0x72, 0x20, 0x6E, 0x75, 0x6D, 0x49, 0x74, 0x65, 0x6D, 0x73, 0x20, 0x3D, 0x20, 0x62, 0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28,
-0x34, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6F, 0x72, 0x20, 0x28, 0x69, 0x20, 0x3D, 0x20,
-0x30, 0x3B, 0x20, 0x69, 0x20, 0x3C, 0x20, 0x6E, 0x75, 0x6D, 0x49, 0x74, 0x65, 0x6D, 0x73, 0x3B, 0x20, 0x2B, 0x2B, 0x69, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x20, 0x3D, 0x20, 0x62,
-0x73, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x20, 0x2B, 0x20, 0x28, 0x33, 0x36, 0x30, 0x20, 0x2A, 0x20, 0x69, 0x29, 0x2C, 0x20,
-0x33, 0x36, 0x30, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D,
-0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x2C, 0x20, 0x33, 0x32, 0x29, 0x2E, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x2E, 0x74, 0x72, 0x69, 0x6D, 0x28, 0x29,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x74,
-0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x34, 0x30, 0x2C, 0x20, 0x36, 0x29, 0x2E, 0x48, 0x65, 0x78, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x32, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x73, 0x73, 0x69, 0x20, 0x3D, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65,
-0x66, 0x28, 0x35, 0x36, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-0x72, 0x20, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x69, 0x74, 0x65, 0x6D, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x36, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x65, 0x6D, 0x69, 0x74, 0x28,
-0x27, 0x53, 0x63, 0x61, 0x6E, 0x27, 0x2C, 0x20, 0x6E, 0x65, 0x77, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x62, 0x73,
-0x73, 0x69, 0x64, 0x2C, 0x20, 0x72, 0x73, 0x73, 0x69, 0x2C, 0x20, 0x6C, 0x71, 0x29, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x7D, 0x0A, 0x0A, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x57, 0x69, 0x72, 0x65,
-0x6C, 0x65, 0x73, 0x73, 0x28, 0x29, 0x0A, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x65, 0x6D, 0x69, 0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x20, 0x3D, 0x20,
-0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x65, 0x76, 0x65, 0x6E, 0x74, 0x73, 0x27, 0x29, 0x2E, 0x69, 0x6E, 0x68, 0x65, 0x72, 0x69, 0x74, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x29,
-0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x5F,
-0x47, 0x65, 0x6E, 0x65, 0x72, 0x69, 0x63, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x27, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76,
-0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6F,
-0x78, 0x79, 0x28, 0x22, 0x77, 0x6C, 0x61, 0x6E, 0x61, 0x70, 0x69, 0x2E, 0x64, 0x6C, 0x6C, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69,
-0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x4F, 0x70, 0x65, 0x6E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x22,
-0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28,
-0x22, 0x57, 0x6C, 0x61, 0x6E, 0x47, 0x65, 0x74, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x42, 0x73, 0x73, 0x4C, 0x69, 0x73, 0x74, 0x22, 0x2C, 0x20, 0x22, 0x47, 0x65, 0x74, 0x42, 0x53, 0x53,
-0x4C, 0x69, 0x73, 0x74, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65,
-0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x22, 0x29,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22,
-0x57, 0x6C, 0x61, 0x6E, 0x45, 0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E,
-0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C, 0x61, 0x6E, 0x53, 0x63, 0x61, 0x6E, 0x22, 0x29, 0x3B, 0x0A,
-0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x22, 0x57, 0x6C,
-0x61, 0x6E, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x22, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6E, 0x65, 0x67,
-0x6F, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69,
-0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x68, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C,
-0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69,
-0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x4F, 0x70, 0x65, 0x6E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x28, 0x32, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x6E, 0x65, 0x67, 0x6F, 0x74, 0x69, 0x61, 0x74,
-0x65, 0x64, 0x2C, 0x20, 0x68, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x20, 0x3D, 0x20, 0x68, 0x2E, 0x56, 0x61, 0x6C, 0x3B,
-0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x6C, 0x6C, 0x62, 0x61, 0x63, 0x6B, 0x50, 0x72, 0x6F,
-0x78, 0x79, 0x28, 0x4F, 0x6E, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x79, 0x2C, 0x20, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46,
-0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x2E, 0x50, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x50, 0x72, 0x65, 0x76, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E,
-0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6C, 0x74, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69,
-0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x58, 0x30, 0x30, 0x30, 0x30, 0x46, 0x46, 0x46, 0x46, 0x2C, 0x20,
-0x30, 0x2C, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54, 0x2E, 0x43, 0x61, 0x6C,
-0x6C, 0x62, 0x61, 0x63, 0x6B, 0x2C, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x5F, 0x4E, 0x4F, 0x54, 0x49, 0x46, 0x59, 0x5F, 0x50, 0x52, 0x4F, 0x58, 0x59, 0x5F, 0x4F, 0x42, 0x4A, 0x45, 0x43, 0x54,
-0x2E, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x50, 0x72, 0x65, 0x76, 0x53, 0x6F, 0x75, 0x72, 0x63, 0x65, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x65, 0x6D, 0x69,
-0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x2E, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x45, 0x76, 0x65, 0x6E, 0x74, 0x28, 0x27, 0x53, 0x63, 0x61, 0x6E, 0x27, 0x29, 0x3B, 0x0A, 0x20,
-0x20, 0x20, 0x20, 0x65, 0x6D, 0x69, 0x74, 0x74, 0x65, 0x72, 0x55, 0x74, 0x69, 0x6C, 0x73, 0x2E, 0x61, 0x64, 0x64, 0x4D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0x28, 0x27, 0x53, 0x63, 0x61, 0x6E, 0x27,
-0x2C, 0x20, 0x5F, 0x53, 0x63, 0x61, 0x6E, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x47, 0x65, 0x74, 0x43, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x65, 0x64,
-0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x20, 0x3D, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x28, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61,
-0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73,
-0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x45, 0x6E, 0x75, 0x6D, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2E,
-0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x63, 0x6F, 0x75, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E,
-0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x30, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44,
-0x65, 0x72, 0x65, 0x66, 0x28, 0x38, 0x2C, 0x20, 0x35, 0x33, 0x32, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6E, 0x61, 0x6D, 0x65, 0x20,
-0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x31, 0x36, 0x2C, 0x20, 0x35, 0x31, 0x32, 0x29, 0x2E, 0x41, 0x6E, 0x73, 0x69, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67,
-0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x73, 0x74, 0x61, 0x74, 0x65, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65,
-0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x28, 0x69, 0x6E,
-0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x38, 0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x20, 0x3D, 0x3D, 0x20, 0x31, 0x29, 0x20, 0x2F, 0x2F,
-0x20, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43, 0x54, 0x45, 0x44, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x76, 0x61, 0x72, 0x20, 0x64, 0x61, 0x74, 0x61, 0x53, 0x69, 0x7A, 0x65, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65,
-0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x70, 0x44,
-0x61, 0x74, 0x61, 0x20, 0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72,
-0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x54, 0x79, 0x70, 0x65, 0x20, 0x3D, 0x20,
-0x74, 0x68, 0x69, 0x73, 0x2E, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x2E, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x65, 0x72, 0x28, 0x29, 0x3B, 0x0A, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x69, 0x6E, 0x66, 0x6F, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66,
-0x28, 0x30, 0x2C, 0x20, 0x31, 0x36, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x74, 0x56, 0x61, 0x6C, 0x20,
-0x3D, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x4E, 0x61, 0x74, 0x69, 0x76, 0x65, 0x2E, 0x57, 0x6C, 0x61, 0x6E, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65,
-0x28, 0x74, 0x68, 0x69, 0x73, 0x2E, 0x48, 0x61, 0x6E, 0x64, 0x6C, 0x65, 0x2C, 0x20, 0x69, 0x67, 0x75, 0x69, 0x64, 0x2C, 0x20, 0x37, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x64, 0x61, 0x74, 0x61, 0x53,
-0x69, 0x7A, 0x65, 0x2C, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2C, 0x20, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x54, 0x79, 0x70, 0x65, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x72, 0x65, 0x74, 0x56, 0x61, 0x6C, 0x20, 0x3D, 0x3D, 0x20, 0x30, 0x29, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x7B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65,
-0x64, 0x53, 0x53, 0x49, 0x44, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x32, 0x34, 0x2C,
-0x20, 0x33, 0x32, 0x29, 0x2E, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72,
-0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x36, 0x30,
-0x2C, 0x20, 0x36, 0x29, 0x2E, 0x48, 0x65, 0x78, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x76, 0x61, 0x72, 0x20, 0x6C, 0x71, 0x20, 0x3D, 0x20, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x29, 0x2E, 0x44, 0x65, 0x72, 0x65, 0x66, 0x28, 0x35, 0x37, 0x36,
-0x2C, 0x20, 0x34, 0x29, 0x2E, 0x49, 0x6E, 0x74, 0x56, 0x61, 0x6C, 0x3B, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x6E, 0x65, 0x77, 0x20, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x50, 0x6F, 0x69, 0x6E, 0x74, 0x28, 0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64,
-0x53, 0x53, 0x49, 0x44, 0x2C, 0x20, 0x62, 0x73, 0x73, 0x69, 0x64, 0x2C, 0x20, 0x30, 0x2C, 0x20, 0x6C, 0x71, 0x29, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x72, 0x6F, 0x77, 0x20, 0x28, 0x22, 0x47, 0x65,
-0x74, 0x43, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x65, 0x64, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x73, 0x3A, 0x20, 0x46, 0x41, 0x49, 0x4C, 0x45, 0x44, 0x20, 0x28, 0x6E, 0x6F, 0x74, 0x20,
-0x61, 0x73, 0x73, 0x6F, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x20, 0x61, 0x20, 0x6E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x29, 0x22, 0x29, 0x3B, 0x0A, 0x20, 0x20, 0x20, 0x20,
-0x7D, 0x3B, 0x0A, 0x0A, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6E, 0x20, 0x28, 0x74, 0x68, 0x69, 0x73, 0x29, 0x3B, 0x0A, 0x7D, 0x0A, 0x0A, 0x6D, 0x6F, 0x64, 0x75, 0x6C,
-0x65, 0x2E, 0x65, 0x78, 0x70, 0x6F, 0x72, 0x74, 0x73, 0x20, 0x3D, 0x20, 0x6E, 0x65, 0x77, 0x20, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x28, 0x29, 0x3B, 0x0A]);
-
-
-
-var WindowsChildScript = new Buffer([
-0x76, 0x61, 0x72, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x28, 0x27, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x43, 0x6F, 0x6E, 0x74,
-0x61, 0x69, 0x6E, 0x65, 0x72, 0x27, 0x29, 0x3B, 0x0D, 0x0A, 0x76, 0x61, 0x72, 0x20, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x20, 0x3D, 0x20, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
-0x28, 0x27, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x27, 0x29, 0x3B, 0x0D, 0x0A, 0x0D, 0x0A, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x2E, 0x6F, 0x6E, 0x28, 0x27, 0x53, 0x63,
-0x61, 0x6E, 0x27, 0x2C, 0x20, 0x66, 0x75, 0x6E, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x28, 0x61, 0x70, 0x29, 0x20, 0x7B, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x2E, 0x73, 0x65, 0x6E, 0x64,
-0x28, 0x61, 0x70, 0x29, 0x3B, 0x20, 0x7D, 0x29, 0x3B, 0x0D, 0x0A, 0x57, 0x69, 0x72, 0x65, 0x6C, 0x65, 0x73, 0x73, 0x2E, 0x53, 0x63, 0x61, 0x6E, 0x28, 0x29, 0x3B, 0x0D, 0x0A]);
-
-
-function AccessPoint(_ssid, _bssid, _lq)
-{
-    this.ssid = _ssid;
-    this.bssid = _bssid;
-    this.lq = _lq;
-}
-AccessPoint.prototype.toString = function ()
-{
-    return (this.ssid + " [" + this.bssid + "]: " + this.lq);
-}
-
-function WiFiScanner()
-{
-    var emitterUtils = require('events').inherits(this);
-    emitterUtils.createEvent('accessPoint');
-
-    this.hasWireless = function ()
-    {
-        var retVal = false;
-        var interfaces = require('os').networkInterfaces();
-        for (var name in interfaces)
-        {
-            if (interfaces[name][0].type == 'wireless') { retVal = true; break; }
-        }
-        return (retVal);
-    };
-
-    this.Scan = function ()
-    {
-        if (process.platform == 'win32')
-        {
-            this.master = require('ScriptContainer').Create(15, ContainerPermissions.DEFAULT);
-            this.master.parent = this;
-            this.master.on('data', function (j) { this.parent.emit('accessPoint', new AccessPoint(j.ssid, j.bssid, j.lq)); });
-
-            this.master.addModule('Wireless', WindowsWireless.toString());
-            this.master.ExecuteString(WindowsChildScript.toString());
-        }
-        else if (process.platform == 'linux')
-        {
-            // Need to get the wireless interface name
-            var interfaces = require('os').networkInterfaces();
-            var wlan = null;
-            for (var i in interfaces)
-            {
-                if (interfaces[i][0].type == 'wireless')
-                {
-                    wlan = i;
-                    break;
-                }
-            }
-            if (wlan != null)
-            {
-                this.child = require('ILibProcessPipe').CreateProcess("/sbin/iwlist", "iwlist", wlan, "scan");
-                this.child.parent = this;
-                this.child.ms = new MemoryStream();
-                this.child.ms.parent = this.child;
-                this.child.on('data', function (buffer) { this.ms.write(buffer); });
-                this.child.on('end', function () { this.ms.end(); });
-                this.child.ms.on('end', function ()
-                {
-                    var str = this.buffer.toString();
-                    tokens = str.split(' - Address: ');
-                    for (var block in tokens)
-                    {
-                        if (block == 0) continue;
-                        var ln = tokens[block].split('\n');
-                        var _bssid = ln[0];
-                        var _lq;
-                        var _ssid;
-
-                        for (var lnblock in ln)
-                        {
-                            lnblock = ln[lnblock].trim();
-                            lnblock = lnblock.trim();
-                            if (lnblock.startsWith('ESSID:'))
-                            {
-                                _ssid = lnblock.slice(7, lnblock.length - 1);
-                                if (_ssid == '<hidden>') { _ssid = ''; }
-                            }
-                            if (lnblock.startsWith('Signal level='))
-                            {
-                                _lq = lnblock.slice(13,lnblock.length-4);
-                            }
-                        }
-                        this.parent.parent.emit('accessPoint', new AccessPoint(_ssid, _bssid, _lq));
-                    }
-                });
-            }
-        }
-    }
-}
-
-module.exports = WiFiScanner;
-
-
-
-
-
-
-
diff --git a/exeHandler.js b/exeHandler.js
index 23274d87..551d239c 100644
--- a/exeHandler.js
+++ b/exeHandler.js
@@ -97,45 +97,37 @@ module.exports.streamExeWithMeshPolicy = function (options) {
         // Pipe the entire source binary without ending the stream.
         options.destinationStream.sourceStream.pipe(options.destinationStream, { end: false });
     } else if (options.platform == 'win32' && options.peinfo.CertificateTableAddress != 0) {
-        // This is a signed windows binary, so we need to do some magic
-        options.mshPadding = (8 - ((options.peinfo.certificateDwLength + options.msh.length + 20) % 8)) % 8; // Compute the padding with quad-align
-
-        //console.log('old table size = ' + options.peinfo.CertificateTableSize);
-        options.peinfo.CertificateTableSize += (options.msh.length + 20 + options.mshPadding); // Add to the certificate table size
-        //console.log('new table size = ' + options.peinfo.CertificateTableSize);
-        //console.log('old certificate dwLength = ' + options.peinfo.certificateDwLength);
-        options.peinfo.certificateDwLength += (options.msh.length + 20 + options.mshPadding); // Add to the certificate size
-        //console.log('new certificate dwLength = ' + options.peinfo.certificateDwLength);
-        //console.log('values were padded with ' + options.mshPadding + ' bytes');
-
         // Read up to the certificate table size and stream that out
         options.destinationStream.sourceStream = require('fs').createReadStream(options.sourceFileName, { flags: 'r', start: 0, end: options.peinfo.CertificateTableSizePos - 1 });
+        options.destinationStream.sourceStream.mshPadding = (8 - ((options.peinfo.certificateDwLength + options.msh.length + 20) % 8)) % 8; // Compute the padding with quad-align
+        options.destinationStream.sourceStream.CertificateTableSize = (options.peinfo.CertificateTableSize + options.msh.length + 20 + options.destinationStream.sourceStream.mshPadding); // Add to the certificate table size
+        options.destinationStream.sourceStream.certificateDwLength = (options.peinfo.certificateDwLength + options.msh.length + 20 + options.destinationStream.sourceStream.mshPadding); // Add to the certificate size
         options.destinationStream.sourceStream.options = options;
+
         options.destinationStream.sourceStream.on('end', function () {
             // We sent up to the CertificateTableSize, now we need to send the updated certificate table size
-            //console.log('read first block');
             var sz = Buffer.alloc(4);
-            sz.writeUInt32LE(this.options.peinfo.CertificateTableSize, 0);
+            sz.writeUInt32LE(this.CertificateTableSize, 0);
             this.options.destinationStream.write(sz); // New cert table size
 
             // Stream everything up to the start of the certificate table entry
             var source2 = require('fs').createReadStream(options.sourceFileName, { flags: 'r', start: this.options.peinfo.CertificateTableSizePos + 4, end: this.options.peinfo.CertificateTableAddress - 1 });
             source2.options = this.options;
+            source2.mshPadding = this.mshPadding;
+            source2.certificateDwLength = this.certificateDwLength;
             source2.on('end', function () {
                 // We've sent up to the Certificate DWLength, which we need to update
-                //console.log('read second block');
                 var sz = Buffer.alloc(4);
-                sz.writeUInt32LE(this.options.peinfo.certificateDwLength, 0);
+                sz.writeUInt32LE(this.certificateDwLength, 0);
                 this.options.destinationStream.write(sz); // New certificate length
 
                 // Stream the entire binary until the end
                 var source3 = require('fs').createReadStream(options.sourceFileName, { flags: 'r', start: this.options.peinfo.CertificateTableAddress + 4 });
                 source3.options = this.options;
+                source3.mshPadding = this.mshPadding;
                 source3.on('end', function () {
                     // We've sent the entire binary... Now send: Padding + MSH + MSHLength + GUID
-                    //console.log('read third block');
-                    if (this.options.mshPadding > 0) { this.options.destinationStream.write(Buffer.alloc(this.options.mshPadding)); } // Padding
-
+                    if (this.mshPadding > 0) { this.options.destinationStream.write(Buffer.alloc(this.mshPadding)); } // Padding
                     this.options.destinationStream.write(this.options.msh); // MSH content
                     var sz = Buffer.alloc(4);
                     sz.writeUInt32BE(this.options.msh.length, 0);
@@ -148,7 +140,7 @@ module.exports.streamExeWithMeshPolicy = function (options) {
             source2.pipe(this.options.destinationStream, { end: false });
             this.options.destinationStream.sourceStream = source2;
         });
-        this.options.destinationStream.sourceStream.pipe(this.options.destinationStream, { end: false });
+        options.destinationStream.sourceStream.pipe(options.destinationStream, { end: false });
     }
 }
 
diff --git a/meshcentral.js b/meshcentral.js
index 28e7048c..f6f91966 100644
--- a/meshcentral.js
+++ b/meshcentral.js
@@ -79,7 +79,7 @@ function CreateMeshCentralServer(config) {
         try { require('./pass').hash('test', function () { }); } catch (e) { console.log('Old version of node, must upgrade.'); return; } // TODO: Not sure if this test works or not.
         
         // Check for invalid arguments
-        var validArguments = ['_', 'notls', 'user', 'port', 'mpsport', 'mpsaliasport', 'redirport', 'cert', 'mpscert', 'deletedomain', 'deletedefaultdomain', 'showall', 'showusers', 'shownodes', 'showmeshes', 'showevents', 'showpower', 'clearpower', 'showiplocations', 'help', 'exactports', 'install', 'uninstall', 'start', 'stop', 'restart', 'debug', 'filespath', 'datapath', 'noagentupdate', 'launch', 'noserverbackup', 'mongodb', 'mongodbcol', 'wanonly', 'lanonly', 'nousers', 'mpsdebug', 'mpspass', 'ciralocalfqdn', 'dbexport', 'dbimport', 'selfupdate', 'tlsoffload', 'userallowedip', 'fastcert', 'swarmport', 'swarmdebug', 'logintoken', 'logintokenkey', 'logintokengen', 'logintokengen', 'mailtokengen'];
+        var validArguments = ['_', 'notls', 'user', 'port', 'aliasport', 'mpsport', 'mpsaliasport', 'redirport', 'cert', 'mpscert', 'deletedomain', 'deletedefaultdomain', 'showall', 'showusers', 'shownodes', 'showmeshes', 'showevents', 'showpower', 'clearpower', 'showiplocations', 'help', 'exactports', 'install', 'uninstall', 'start', 'stop', 'restart', 'debug', 'filespath', 'datapath', 'noagentupdate', 'launch', 'noserverbackup', 'mongodb', 'mongodbcol', 'wanonly', 'lanonly', 'nousers', 'mpsdebug', 'mpspass', 'ciralocalfqdn', 'dbexport', 'dbimport', 'selfupdate', 'tlsoffload', 'userallowedip', 'fastcert', 'swarmport', 'swarmdebug', 'logintoken', 'logintokenkey', 'logintokengen', 'logintokengen', 'mailtokengen'];
         for (var arg in obj.args) { obj.args[arg.toLocaleLowerCase()] = obj.args[arg]; if (validArguments.indexOf(arg.toLocaleLowerCase()) == -1) { console.log('Invalid argument "' + arg + '", use --help.'); return; } }
         if (obj.args.mongodb == true) { console.log('Must specify: --mongodb [connectionstring] \r\nSee https://docs.mongodb.com/manual/reference/connection-string/ for MongoDB connection string.'); return; }
         for (var i in obj.config.settings) { obj.args[i] = obj.config.settings[i]; } // Place all settings into arguments, arguments have already been placed into settings so arguments take precedence.
@@ -106,7 +106,7 @@ function CreateMeshCentralServer(config) {
         
         // Check if we need to install, start, stop, remove ourself as a background service
         if ((obj.service != null) && ((obj.args.install == true) || (obj.args.uninstall == true) || (obj.args.start == true) || (obj.args.stop == true) || (obj.args.restart == true))) {
-            var env = [], xenv = ['user', 'port', 'mpsport', 'mpsaliasport', 'redirport', 'exactport', 'debug'];
+            var env = [], xenv = ['user', 'port', 'aliasport', 'mpsport', 'mpsaliasport', 'redirport', 'exactport', 'debug'];
             for (var i in xenv) { if (obj.args[xenv[i]] != null) { env.push({ name: 'mesh' + xenv[i], value: obj.args[xenv[i]] }); } } // Set some args as service environement variables.
             var svc = new obj.service({ name: 'MeshCentral', description: 'MeshCentral Remote Management Server', script: obj.path.join(__dirname, 'meshcentral.js'), env: env, wait: 2, grow: .5 });
             svc.on('install', function () { console.log('MeshCentral service installed.'); svc.start(); });
@@ -224,6 +224,7 @@ function CreateMeshCentralServer(config) {
         if ((obj.args.ciralocalfqdn != null) && ((obj.args.lanonly == true) || (obj.args.wanonly == true))) { console.log("WARNING: CIRA local FQDN's ignored when server in LAN-only or WAN-only mode."); }
         if ((obj.args.ciralocalfqdn != null) && (obj.args.ciralocalfqdn.split(',').length > 4)) { console.log("WARNING: Can't have more than 4 CIRA local FQDN's. Ignoring value."); obj.args.ciralocalfqdn = null; }
         if (obj.args.port == null || typeof obj.args.port != 'number') { if (obj.args.notls == null) { obj.args.port = 443; } else { obj.args.port = 80; } }
+        if (obj.args.aliasport != null && (typeof obj.args.aliasport != 'number')) obj.args.aliasport = null;
         if (obj.args.mpsport == null || typeof obj.args.mpsport != 'number') obj.args.mpsport = 4433;
         if (obj.args.mpsaliasport != null && (typeof obj.args.mpsaliasport != 'number')) obj.args.mpsaliasport = null;
         if (obj.args.notls == null && obj.args.redirport == null) obj.args.redirport = 80;
@@ -848,8 +849,8 @@ function CreateMeshCentralServer(config) {
         0: { id: 0, localname: 'Unknown', rname: 'meshconsole.exe', desc: 'Unknown agent', update: false, amt: true, platform: 'unknown' },
         1: { id: 1, localname: 'MeshConsole.exe', rname: 'meshconsole.exe', desc: 'Windows x86-32 console', update: true, amt: true, platform: 'win32' },
         2: { id: 2, localname: 'MeshConsole64.exe', rname: 'meshconsole.exe', desc: 'Windows x86-64 console', update: true, amt: true, platform: 'win32' },
-        3: { id: 3, localname: 'MeshService.exe', rname: 'meshagent.exe', desc: 'Windows x86-32 service', update: true, amt: true, platform: 'win32' },
-        4: { id: 4, localname: 'MeshService64.exe', rname: 'meshagent.exe', desc: 'Windows x86-64 service', update: true, amt: true, platform: 'win32' },
+        3: { id: 3, localname: 'MeshService-signed.exe', rname: 'meshagent.exe', desc: 'Windows x86-32 service', update: true, amt: true, platform: 'win32' },
+        4: { id: 4, localname: 'MeshService64-signed.exe', rname: 'meshagent.exe', desc: 'Windows x86-64 service', update: true, amt: true, platform: 'win32' },
         5: { id: 5, localname: 'meshagent_x86', rname: 'meshagent', desc: 'Linux x86-32', update: true, amt: true, platform: 'linux' },
         6: { id: 6, localname: 'meshagent_x86-64', rname: 'meshagent', desc: 'Linux x86-64', update: true, amt: true, platform: 'linux' },
         7: { id: 7, localname: 'meshagent_mips', rname: 'meshagent', desc: 'Linux MIPS', update: true, amt: false, platform: 'linux' },
@@ -870,7 +871,9 @@ function CreateMeshCentralServer(config) {
         22: { id: 22, localname: 'MeshAgent-WinMinCore-Service-x86-64.exe', rname: 'meshagent.exe', desc: 'Windows MinCore Service x86-32', update: true, amt: false, platform: 'win32' },
         23: { id: 23, localname: 'MeshAgent-NodeJS', rname: 'meshagent', desc: 'NodeJS', update: false, amt: false, platform: 'node' }, // Get this one from NPM
         24: { id: 24, localname: 'meshagent_arm-linaro', rname: 'meshagent', desc: 'Linux ARM Linaro', update: true, amt: false, platform: 'linux' },
-        25: { id: 25, localname: 'meshagent_pi', rname: 'meshagent', desc: 'Linux ARM - Raspberry Pi', update: true, amt: false, platform: 'linux' } // "armv6l" and "armv7l"
+        25: { id: 25, localname: 'meshagent_pi', rname: 'meshagent', desc: 'Linux ARM - Raspberry Pi', update: true, amt: false, platform: 'linux' }, // "armv6l" and "armv7l"
+        10003: { id: 3, localname: 'MeshService.exe', rname: 'meshagent.exe', desc: 'Windows x86-32 service', update: true, amt: true, platform: 'win32' }, // Unsigned version of the MeshAgent
+        10004: { id: 4, localname: 'MeshService64.exe', rname: 'meshagent.exe', desc: 'Windows x86-64 service', update: true, amt: true, platform: 'win32' } // Unsigned version of the MeshAgent
     };
 
     // Update the list of available mesh agents
@@ -1091,7 +1094,7 @@ InstallModules(['minimist'], function () {
     if (config == null) { process.exit(); }
 
     // Build the list of required modules
-    var modules = ['ws', 'nedb', 'https', 'unzip', 'xmldom', 'express', 'mongojs', 'archiver', 'multiparty', 'node-forge', 'express-ws', 'compression', 'body-parser', 'connect-redis', 'express-session', 'express-handlebars'];
+    var modules = ['ws', 'nedb', 'https', 'unzip', 'xmldom', 'express', 'archiver', 'multiparty', 'node-forge', 'express-ws', 'compression', 'body-parser', 'connect-redis', 'express-session', 'express-handlebars'];
     if (require('os').platform() == 'win32') { modules.push('node-sspi'); modules.push('node-windows'); } // Add Windows modules
     if (config.letsencrypt != null) { modules.push('greenlock'); modules.push('le-store-certbot'); modules.push('le-challenge-fs'); modules.push('le-acme-core'); } // Add Greenlock Modules
     if (config.settings.mongodb != null) { modules.push('mongojs'); } // Add MongoDB
diff --git a/meshuser.js b/meshuser.js
index 74c113ce..fa842e5b 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -928,9 +928,10 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain) {
 
         // Figure out the MPS port, use the alias if set
         var mpsport = ((obj.args.mpsaliasport != null) ? obj.args.mpsaliasport : obj.args.mpsport);
+        var httpport = ((obj.args.aliasport != null) ? obj.args.aliasport : obj.args.port);
 
         // Build server information object
-        var serverinfo = { name: obj.parent.certificates.CommonName, mpsname: obj.parent.certificates.AmtMpsName, mpsport: mpsport, mpspass: obj.args.mpspass, port: obj.args.port, emailcheck: obj.parent.parent.mailserver != null }
+        var serverinfo = { name: obj.parent.certificates.CommonName, mpsname: obj.parent.certificates.AmtMpsName, mpsport: mpsport, mpspass: obj.args.mpspass, port: httpport, emailcheck: obj.parent.parent.mailserver != null }
         if (obj.args.notls != true) { serverinfo.https = false; } else { serverinfo.https = true; serverinfo.redirport = obj.args.redirport; }
 
         // Send server information
diff --git a/package.json b/package.json
index 92eeb4e0..9ce615c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.1.4-s",
+  "version": "0.1.4-v",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.application b/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.application
deleted file mode 100644
index fcd98cf0..00000000
--- a/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.application	
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="MeshMiniRouter.application" version="2.0.0.7" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="Meshcentral.com" asmv2:product="Meshcentral Mini-Router" asmv2:supportUrl="https://meshcentral.com/" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <deployment install="false" mapFileExtensions="true" trustURLParameters="true" />
-  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
-    <framework targetVersion="4.5" profile="Full" supportedRuntime="4.0.30319" />
-  </compatibleFrameworks>
-  <dependency>
-    <dependentAssembly dependencyType="install" codebase="Application Files\MeshMiniRouter_2_0_0_7\MeshMiniRouter.exe.manifest" size="4711">
-      <assemblyIdentity name="MeshMiniRouter.exe" version="2.0.0.7" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>VsPkLYR71TSqI8oGBBeXzb5hGi4R2xtQaGQJ0zmsTic=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.exe.config.deploy b/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.exe.config.deploy
deleted file mode 100644
index 3f1c1821..00000000
--- a/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.exe.config.deploy	
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="MeshMiniRouterTool.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-            <section name="MeshMiniRouterTool.Settings1" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-            <section name="MeshNetworkRouterTool.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <MeshMiniRouterTool.Properties.Settings>
-            <setting name="PuttyPath" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="Upgraded" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="UltraVncPath" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="HybridCloudManager" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="TightVncPath" serializeAs="String">
-                <value/>
-            </setting>
-            <setting name="WinSCPPath" serializeAs="String">
-                <value/>
-            </setting>
-        </MeshMiniRouterTool.Properties.Settings>
-        <MeshMiniRouterTool.Settings1>
-            <setting name="puttypath" serializeAs="String">
-                <value/>
-            </setting>
-        </MeshMiniRouterTool.Settings1>
-        <MeshNetworkRouterTool.Properties.Settings>
-            <setting name="Server" serializeAs="String">
-                <value/>
-            </setting>
-        </MeshNetworkRouterTool.Properties.Settings>
-    </userSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.exe.deploy b/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.exe.deploy
deleted file mode 100644
index 70b52d10..00000000
Binary files a/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.exe.deploy and /dev/null differ
diff --git a/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.exe.manifest b/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.exe.manifest
deleted file mode 100644
index 862fb719..00000000
--- a/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.exe.manifest	
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="MeshMiniRouter.exe" version="2.0.0.7" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
-  <description asmv2:iconFile="MeshMiniRouter.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <application />
-  <entryPoint>
-    <assemblyIdentity name="MeshMiniRouter" version="1.0.6505.20092" language="neutral" processorArchitecture="msil" />
-    <commandLine file="MeshMiniRouter.exe" parameters="" />
-  </entryPoint>
-  <trustInfo>
-    <security>
-      <applicationRequestMinimum>
-        <PermissionSet version="1" class="System.Security.NamedPermissionSet" Name="Internet" Description="Default rights given to Internet applications" Unrestricted="true" ID="Custom" SameSite="site" />
-        <defaultAssemblyRequest permissionSetReference="Custom" />
-      </applicationRequestMinimum>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-            If you want to change the Windows User Account Control level replace the 
-            requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Specifying requestedExecutionLevel node will disable file and registry virtualization.
-            If you want to utilize File and Registry Virtualization for backward 
-            compatibility then delete the requestedExecutionLevel node.
-        -->
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentOS>
-      <osVersionInfo>
-        <os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
-      </osVersionInfo>
-    </dependentOS>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="MeshMiniRouter.exe" size="193536">
-      <assemblyIdentity name="MeshMiniRouter" version="1.0.6505.20092" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>G2b79xma2HCz/aTfnkt2L3I8c7mPbDDlU8IsdlFiDg8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <file name="MeshMiniRouter.exe.config" size="2397">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>UylUFD4/o0KBti+5/eodTDgq4BkUJD0J0aUXNd3yHbY=</dsig:DigestValue>
-    </hash>
-  </file>
-  <file name="MeshMiniRouter.ico" size="1078">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>mkjbDQuo7YXa8wZxdKEu/ECXrORwwtpRgNj8NBKbzHo=</dsig:DigestValue>
-    </hash>
-  </file>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
-      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
-    </application>
-  </compatibility>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.ico.deploy b/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.ico.deploy
deleted file mode 100644
index 6c82eccb..00000000
Binary files a/public/clickonce/minirouter/Application Files/MeshMiniRouter_2_0_0_7/MeshMiniRouter.ico.deploy and /dev/null differ
diff --git a/public/index.html b/public/index.html
deleted file mode 100644
index 6dc064a6..00000000
--- a/public/index.html
+++ /dev/null
@@ -1,3091 +0,0 @@
-<!DOCTYPE html>
-<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-    <meta name="viewport" content="user-scalable=1.0,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="format-detection" content="telephone=no" />
-    <link type="text/css" href="styles/style.css" media="screen" rel="stylesheet" title="CSS" />
-    <script type="text/javascript" src="scripts/common-0.0.1.js"></script>
-    <script type="text/javascript" src="scripts/meshcentral.js"></script>
-    <script type="text/javascript" src="scripts/amt-0.2.0.js"></script>
-    <script type="text/javascript" src="scripts/amt-wsman-0.2.0.js"></script>
-    <script type="text/javascript" src="scripts/amt-desktop-0.0.2.js"></script>
-    <script type="text/javascript" src="scripts/amt-terminal-0.0.2.js"></script>
-    <script type="text/javascript" src="scripts/inflate.js"></script>
-    <script type="text/javascript" src="scripts/amt-redir-ws-0.1.0.js"></script>
-    <script type="text/javascript" src="scripts/amt-wsman-ws-0.2.0.js"></script>
-    <script type="text/javascript" src="scripts/agent-redir-ws-0.1.0.js"></script>
-    <script type="text/javascript" src="scripts/filesaver.1.1.20151003.js"></script>
-    <title>MeshCentral</title>
-</head>
-
-<body onload="if (typeof(startup) !== 'undefined') startup();" oncontextmenu="handleContextMenu(event)">
-    <!-- right click menu -->
-    <div id="contextMenu" class="contextMenu" style="display: none">
-        <div id="cxinfo" class="cmtext" onclick="cmaction(1)"><b>Information</b></div>
-        <div id="cxterminal" class="cmtext" onclick="cmaction(2)">Terminal</div>
-        <div id="cxdesktop" class="cmtext" onclick="cmaction(3)">Desktop</div>
-        <div id="cxfiles" class="cmtext" onclick="cmaction(4)">Files</div>
-        <div id="cxconsole" class="cmtext" onclick="cmaction(5)">Console</div>
-        <hr id="cxmgroupsplit" />
-        <div id="cxmdesktop" class="cmtext" onclick="cmaction(6)" style=display:none>Multi-Desktop</div>
-    </div>
-    <div id="meshContextMenu" class="contextMenu" style="display: none; min-width: 0px">
-        <div id="cxselectall" class="cmtext" onclick="cmmeshaction(1)">Select All</div>
-        <div id="cxselectnone" class="cmtext" onclick="cmmeshaction(2)">Select None</div>
-        <hr id="cxmgroupsplit2" style=display:none />
-        <div id="cxmmdesktop" class="cmtext" style=display:none onclick="cmmeshaction(3)">Multi-Desktop</div>
-    </div>
-    <!-- main page -->
-    <div id=container style=max-height:100vh;position:relative>
-        <div id="notifiyBox" class="notifiyBox" style="display:none"></div>
-        <div id=mastheadx></div>
-        <div id=masthead style="background:url(images/logoback.png) 0px 0px;background-color:#036;background-repeat:no-repeat;height:66px;width:100%;overflow:hidden">
-            <div style="float:left;height:66px;color:#c8c8c8;padding-left:20px;padding-top:8px">
-                <strong><font style="font-size:46px;font-family:Arial,Helvetica,sans-serif">{{{title}}}</font></strong>
-            </div>
-            <div style="float:left;height:66px;color:#c8c8c8;padding-left:5px;padding-top:14px">
-                <strong><font style="font-size:14px;font-family:Arial,Helvetica,sans-serif">{{{title2}}}</font></strong>
-            </div>
-            <div style="float:right">
-                <div id=notificationCount onclick="clickNotificationIcon()" class="unselectable" style="display:none;min-width:28px;font-size:20px;border-radius:5px;background-color:lightblue;text-align:center;margin:8px;cursor:pointer;padding:4px" title="Click to view current notifications">0</div>
-            </div>
-            <p>{{{logoutControl}}}</p>
-        </div>
-        <div id=topbar style=display:none>
-            <div>
-                <div>
-                    <table style=width:100%;height:22px cellpadding=0 cellspacing=0 class=style1>
-                        <tr>
-                            <td id=MainMenuMyDevices style=width:100px;height:24px;cursor:pointer class=style3 onclick=go(1)>My Devices</td>
-                            <td id=MainMenuMyAccount style=width:100px;height:24px;cursor:pointer class=style3 onclick=go(2)>My Account</td>
-                            <td id=MainMenuMyEvents style=width:100px;height:24px;cursor:pointer class=style3 onclick=go(3)>My Events</td>
-                            <td id=MainMenuMyFiles style=width:100px;height:24px;cursor:pointer class=style3 onclick=go(5)>My Files</td>
-                            <td id=MainMenuMyUsers style=width:100px;height:24px;cursor:pointer;display:none class=style3 onclick=go(4)>My Users</td>
-                            <td class=style3 style=height:24px>&nbsp;</td>
-                        </tr>
-                    </table>
-                    <div id="MainSubMenuSpan" style=display:none>
-                        <table id="MainSubMenu" style="width: 100%; height: 22px;" cellpadding=0 cellspacing=0 class=style1>
-                            <tr>
-                                <td id=MainDev style=width:100px;height:24px;cursor:pointer class=style3 onclick=go(10)>General</td>
-                                <td id=MainDevDesktop style=width:100px;height:24px;cursor:pointer class=style3 onclick=go(11)>Desktop</td>
-                                <td id=MainDevTerminal style=width:100px;height:24px;cursor:pointer class=style3 onclick=go(12)>Terminal</td>
-                                <td id=MainDevFiles style=width:100px;height:24px;cursor:pointer;display:none class=style3 onclick=go(13)>Files</td>
-                                <td id=MainDevAmt style=width:100px;height:24px;cursor:pointer class=style3 onclick=go(14)>Intel&reg; AMT</td>
-                                <td id=MainDevConsole style=width:100px;height:24px;cursor:pointer class=style3 onclick=go(15)>Console</td>
-                                <td class=style3 style=height:24px>&nbsp;</td>
-                            </tr>
-                        </table>
-                    </div>
-                    <div id="MeshSubMenuSpan" style=display:none>
-                        <table id="MeshSubMenu" style="width: 100%; height: 22px;" cellpadding=0 cellspacing=0 class=style1>
-                            <tr>
-                                <td id=MeshGeneral style=width:100px;height:24px;cursor:pointer class=style3 onclick=go(20)>General</td>
-                                <td class=style3 style=height:24px>&nbsp;</td>
-                            </tr>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div id="page_content" style="max-height:calc(100vh - 138px)">
-            <div id="column_l">
-                <div id=p0 style=display:none>
-                    <div id=p0message style=margin:50px;text-align:center>Server disconnected, <href onclick=reload() style=cursor:pointer><u>click to reconnect</u></href>.</div>
-                </div>
-                <div id=p1 style=display:none>
-                    <h1>My Devices</h1>
-                    <div style=width:100%;height:24px;background-color:#d3d9d6>
-                        <div class=style7 style=width:84px;height:100%;float:left>&nbsp;</div>
-                        <div class=h1 style=height:100%;float:left>&nbsp;</div>
-                        <div class=style14 style=height:100%;float:left>
-                            &nbsp;&nbsp;<input type="button" id="SelectAllButton" onclick="selectallButtonFunction();" value="Select All" />&nbsp;
-                            <input type="button" id="GroupActionButton" disabled="disabled" value="Group Action" onclick="groupActionFunction();" />&nbsp;
-                            <input id="SearchInput" type="text" style=width:120px placeholder=Search onchange="onSearchInputChanged()" onkeyup="onSearchInputChanged()" autocomplete=off onfocus="onSearchFocus(1);" onblur="onSearchFocus(0);" />&nbsp;
-                            <input type="checkbox" id="HostnameCheckBox" onclick="onHostnameCheckBox()" /><span title="Show device hostnames">Hostname</span>
-                        </div>
-                        <div class="auto-style1" style="height: 100%; float: right">
-                            <div style="height: 100%; width: 4px; float: right; background-color: #ffffff"></div>
-                            <div class="h2" style="height: 100%; float: right;">&nbsp;</div>
-                            <div style="float: right">
-                                Sort
-                                <select id="sortselect" onchange="onSortSelectChange()">
-                                    <option>Mesh</option>
-                                    <option>Power</option>
-                                    <option>Device</option>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                    <div id=NoNodesPanel style=display:none>
-                        <table style="width: 100%">
-                            <tr>
-                                <td valign="top" style="width: 50px">
-                                    <img src="images/info.png" height="48" width="47" />
-                                </td>
-                                <td>
-                                    No nodes found with this search criteria. To create a mesh network and add devices, start at the <a onclick=go(2) style="cursor:pointer">My Account</a> page.
-                                </td>
-                            </tr>
-                        </table>
-                        <p></p>
-                    </div>
-                    <div id="xdevices" style="max-height:calc(100vh - 228px);overflow-y:auto;-webkit-overflow-scrolling:touch;"></div>
-                </div>
-                <div id=p2 style=display:none>
-                    <h1>My Account</h1>
-                    <p><strong><img alt="" width=150 height=103 src=images/mainaccount.png style=margin-bottom:10px;margin-right:20px;float:right />Account actions</strong></p>
-                    <p style="margin-left:40px">
-                        <a onclick="account_showChangePassword()" style="cursor:pointer">Change password</a><br />
-                        <a onclick="account_showDeleteAccount()" style="cursor:pointer">Delete account</a><br />
-                    </p>
-                    <p id="p2ServerActions"><strong>Server actions</strong></p>
-                    <p style="margin-left:40px">
-                        <a id="p2ServerActionsBackup" href="/backup.zip" target="_blank" style="cursor:pointer">Download server backup</a><br />
-                        <a id="p2ServerActionsRestore" onclick="server_showRestoreDlg()" style="cursor:pointer">Restore server with backup</a><br />
-                    </p>
-                    <br style=clear:both />
-                    <strong>Administrative Meshes</strong>
-                    ( <a onclick=account_createMesh() style=cursor:pointer><img height=12 src="images/icon-addnew.png" width=12 border=0 /> New</a> )
-                    <br /><br />
-                    <div id=p2meshes></div>
-                    <div id=p2noMeshFound style=margin-left:40px;display:none>No meshes found. <a onclick=account_createMesh() style=cursor:pointer><strong>Get started here!</strong></a><br /><br /></div>
-                </div>
-                <div id=p3 style=display:none>
-                    <h1>My Events</h1>
-                    <div style=width:100%;height:24px;background-color:#d3d9d6;margin-bottom:4px>
-                        <div class=style7 style=width:16px;height:100%;float:left>&nbsp;</div>
-                        <div class=h1 style=height:100%;float:left>&nbsp;</div>
-                        <div class=style14 style=height:100%;float:left>&nbsp;&nbsp;<input id=p2deleteall type=button onclick=showDeleteAllEventsDialog() style=display:none value="Delete All..." />&nbsp;</div>
-                        <div class="auto-style1" style="height:100%;float:right">
-                            <div style="height:100%;width:20px;float:right;background-color:#ffffff"></div>
-                            <div class="h2" style="height:100%;float:right;">&nbsp;</div>
-                        </div>
-                    </div>
-                    <div id=p3events style="max-height:600px;overflow-y:scroll"></div>
-                </div>
-                <div id=p4 style=display:none>
-                    <h1>My Users</h1>
-                    <div style=width:100%;height:24px;background-color:#d3d9d6;margin-bottom:4px>
-                        <div class=style7 style=width:16px;height:100%;float:left>&nbsp;</div>
-                        <div class=h1 style=height:100%;float:left>&nbsp;</div>
-                        <div class=style14 style=height:100%;float:left>&nbsp;&nbsp;<input type=button onclick=showCreateNewAccountDialog() value="New Account..." />&nbsp;</div>
-                        <div class=auto-style1 style="height:100%;float:right">
-                            <div style="height:100%;width:20px;float:right;background-color:#ffffff"></div>
-                            <div class=h2 style="height:100%;float:right">&nbsp;</div>
-                        </div>
-                    </div>
-                    <div id="p3users" style="max-height:600px;overflow-y:auto"></div>
-                </div>
-                <div id=p5 style=display:none>
-                    <h1>My Files</h1>
-                    <table id="p5toolbar" style="width: 100%" cellpadding="0" cellspacing="0">
-                        <tr>
-                            <td style="width:100%;background-color:#d3d9d6;text-align:left;padding:4px" valign=bottom>
-                                <div id="p5rightOfButtons" style="float:right;margin-top:3px"></div>
-                                <div>
-                                    <input type="button" id="p5FolderUp" disabled="disabled" onclick="p5folderup();" value="Up" />&nbsp;
-                                    <input type="button" id="p5SelectAllButton" disabled="disabled" onclick="p5selectallfile();" value="Select All" onkeypress="return false;" onkeydown="return false;" />&nbsp;
-                                    <input type="button" id="p5RenameFileButton" disabled="disabled" value="Rename" onclick="p5renamefile();" onkeypress="return false;" onkeydown="return false;" />&nbsp;
-                                    <input type="button" id="p5DeleteFileButton" disabled="disabled" value="Delete" onclick="p5deletefile();" onkeypress="return false;" onkeydown="return false;" />&nbsp;
-                                    <input type="button" id="p5NewFolderButton" disabled="disabled" value="New Folder" onclick="p5createfolder();" onkeypress="return false;" onkeydown="return false;" />&nbsp;
-                                    <input type="button" id="p5UploadButton" disabled="disabled" value="Upload" onclick="p5uploadFile()" onkeypress="return false;" onkeydown="return false;" />&nbsp;
-                                </div>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td style="background-color:#E4E9E7;height:28px">
-                                <div style=float:right>
-                                    <select id=p5sortdropdown onchange=updateFiles()>
-                                        <option value="1" selected="selected">Sort by name</option>
-                                        <option value="2">Sort by size</option>
-                                        <option value="3">Sort by date</option>
-                                        <option value="4">Descend by name</option>
-                                        <option value="5">Descend by size</option>
-                                        <option value="6">Descend by date</option>
-                                    </select>
-                                </div>
-                                <div>&nbsp;&nbsp;<span id="p5currentpath"></span></div>
-                            </td>
-                        </tr>
-                    </table>
-                    <div id="p5filetable" style="width:100%;height:500px;overflow:auto;-webkit-user-select:none">
-                        <div id="p5PublicShare" style="display:none;width:100%;padding:4px;overflow:auto;-webkit-user-select:none;background-color:lightsteelblue">This files is shared publically, click "link" to get public url.</div>
-                        <div id="bigok" style="width:256px;overflow:hidden;position:absolute;left:337px;top:200px;text-align:center;font-size:1600%;color:#AAAAAA;display:none"><b>&checkmark;</b></div>
-                        <div id="bigfail" style="width:256px;overflow:hidden;position:absolute;left:337px;top:200px;text-align:center;font-size:1600%;color:#AAAAAA;display:none"><b>&#10007;</b></div>
-                        <span id="p5files"></span>
-                    </div>
-                    <table id="p5toolbarBottom" style=width:100% cellpadding=0 cellspacing=0>
-                        <tr><td class=style6 style="text-align:left">&nbsp;<span id="bottomstatus"></span></td></tr>
-                    </table>
-                </div>
-                <div id=p10 style=display:none>
-                    <table style="width:100%" cellpadding="0" cellspacing="0">
-                        <tr>
-                            <td style=width:auto valign=top>
-                                <h1><span id=p10deviceName></span> - General</h1>
-                                <div id=p10html></div>
-                            </td>
-                            <td style=width:20px></td>
-                            <td style=width:200px>
-                                <a style=cursor:pointer onclick=p10showiconselector()><img id=MainComputerImage style=border-width:0px;height:200px;width:200px></a>
-                                <div style="width:100%;text-align:center"><strong><span id=MainComputerState class=style7></span></strong></div>
-                            </td>
-                        </tr>
-                    </table><br>
-                    <div id=p10html2></div>
-                    <div id=p10html3></div>
-                </div>
-                <div id=p11 style=display:none>
-                    <h1 id=p11deviceNameHeader><span id=p11deviceName></span> - Desktop</h1>
-                    <div id="p14warning" style='max-width:100%;display:none;cursor:pointer;margin-bottom:5px' onclick="showFeaturesDlg()">
-                        <div class="icon2" style="float:left;margin:7px" />
-                        <div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Intel&reg; AMT Redirection port or KVM feature is disabled<span id="p14warninga">, click here to enable it.</span></div>
-                    </div>
-                </div>
-                <div id="p14warning2" style='max-width:100%;display:none;cursor:pointer;margin-bottom:5px' onclick="showPowerActionDlg()">
-                    <div class="icon2" style="float:left;margin:7px" />
-                    <div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Remote computer is not powered on, click here to issue a power command.</div>
-                </div>
-            </div>
-            <table cellpadding=0 cellspacing=0 style="width:100%;padding:0px;padding:0px;margin-top:0px">
-                <tr id=deskarea1>
-                    <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
-                        <div style="float:right;text-align:right">
-                            <span id="p14power"></span>&nbsp;
-                            <div style='cursor:pointer;border:none;float:right;font-size:130%;margin-right:4px' title="Rotate Left" onclick="drotate(-1)">&olarr;</div>
-                            <div style='cursor:pointer;border:none;float:right;font-size:130%;margin-right:4px' title="Rotate Right" onclick="drotate(1)">&orarr;</div>
-                            <input id="deskFullBtn" type="button" title="Toggle full screen mode" onkeypress="return false" onkeydown="return false" value="Full" onclick="deskToggleFull()" style="margin-right:3px">
-                            <input id="deskFocusBtn" type="button" title="Toggle focus mode, when active only the region around the mouse is updated" onkeypress="return false" onkeydown="return false" value="Focus All" onclick="deskToggleFocus()" style="margin-right:3px">
-                            <input id="deskSaveBtn" type="button" title="Save a screenshot of the remote desktop" onkeypress="return false" onkeydown="return false" value="Save..." onclick="deskSaveImage()" style="margin-right:3px">
-                            <input type="button" value="Settings..." title="Edit remote desktop settings" onkeypress="return false" onkeydown="return false" onclick="showDesktopSettings()" style="margin-right:3px">
-                            <input type="button" title="Change the power state of the remote machine" onkeypress="return false" onkeydown="return false" value="Power Actions..." onclick="showPowerActionDlg()" style="margin-right:3px;display:none">
-                        </div>
-                        <div>
-                            <div id="idx_deskFullBtn2" onclick="deskToggleFull()" style="float:left;font-size:large;cursor:pointer;display:none">&nbsp;X</div>
-                            &nbsp;<input type="button" id="connectbutton1" value="Connect" onclick="connectDesktop(event)" onkeypress="return false" onkeydown="return false" disabled="disabled">
-                            &nbsp;<span id="deskstatus">Disconnected.</span>
-                        </div>
-                    </td>
-                </tr>
-                <tr id=deskarea2>
-                    <td>
-                        <div style="background-color:gray"><div id="progressbar" style="height:2px;width:0%;background-color:red"></div></div>
-                    </td>
-                </tr>
-                <tr id=deskarea3>
-                    <td id=deskarea3x style="background:black;text-align:center;height:400px;position:relative">
-                        <div id="DeskFocus" style="color:transparent;border:3px dotted rgba(255,0,0,.2);position:absolute;border-radius:5px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></div>
-                        <canvas id="Desk" width="640" height="400" style="width:100%;-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></canvas>
-                    </td>
-                </tr>
-                <tr id=deskarea4>
-                    <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
-                        <div>
-                            &nbsp;
-                            <input id="DeskCAD" type="button" value="Ctrl-Alt-Del" onkeypress="return false" onkeydown="return false" onclick="sendCAD()">&nbsp;
-                        </div>
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <div id=p12 style=display:none>
-            <h1><span id=p12deviceName></span> - Terminal</h1>
-            <div id="p12warning" style='max-width:100%;display:none;cursor:pointer;margin-bottom:5px' onclick=showFeaturesDlg()>
-                <div class="icon2" style="float:left;margin:7px"></div>
-                <div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Intel&reg; AMT Redirection port or KVM feature is disabled<span id="p14warninga">, click here to enable it.</span></div>
-            </div>
-            <div id="p12warning2" style='max-width:100%;display:none;cursor:pointer;margin-bottom:5px' onclick=showPowerActionDlg()>
-                <div class="icon2" style="float:left;margin:7px"></div>
-                <div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Remote computer is not powered on, click here to issue a power command.</div>
-            </div>
-            <table cellpadding=0 cellspacing=0 style="width:100%;padding:0px;padding:0px;margin-top:0px">
-                <tr>
-                    <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
-                        <div>
-                            &nbsp;<input type="button" id="connectbutton2" value="Connect" onclick="connectTerminal(event)" onkeypress="return false" onkeydown="return false" disabled="disabled">
-                            &nbsp;<span id="termstatus">Disconnected.</span>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <div style="background-color:gray"><div id="termprogressbar" style="height:2px;width:0%;background-color:red"></div></div>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="background:black;text-align:center;height:400px;position:relative">
-                        <pre id="Term" style="background:black;margin:0;padding:0"></pre>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
-                        <div style="float:right;text-align:right">
-                            <input id="id_tfxkeysbutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="Intel (F10 = ESC+[OM)" title="Toggle F1 to F10 keys emulation type" onclick="termToggleFx()">&nbsp;
-                            <input id="id_ttypebutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="Extended Ascii" title="Toggle terminal emulation type" onclick="termToggleType()">&nbsp;
-                        </div>
-                        <div>
-                            &nbsp;
-                        </div>
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <div id=p13 style=display:none>
-            <h1><span id=p13deviceName></span> - Files</h1>
-            <table id="p13toolbar" style="width: 100%" cellpadding="0" cellspacing="0">
-                <tr>
-                    <td style="background-color:#C0C0C0;border-bottom:2px solid black;padding:2px">
-                        <input id=p13Connect value="Connect" onclick=connectFiles(event) onkeypress="return false" onkeydown="return false" type="button">
-                        <span id=p13Status>Disconnected.</span>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="width:100%;background-color:#d3d9d6;text-align:left;padding:4px" valign=bottom>
-                        <div id="p13rightOfButtons" style="float:right;margin-top:3px"></div>
-                        <div>
-                            <input type=button id="p13FolderUp" disabled="disabled" onclick="p13folderup()" value="Up" />&nbsp;
-                            <input type=button id="p13SelectAllButton" disabled="disabled" onclick="p13selectallfile()" value="Select All" onkeypress="return false;" onkeydown="return false;" />&nbsp;
-                            <input type=button id="p13RenameFileButton" disabled="disabled" value="Rename" onclick="p13renamefile()" onkeypress="return false;" onkeydown="return false;" />&nbsp;
-                            <input type=button id="p13DeleteFileButton" disabled="disabled" value="Delete" onclick="p13deletefile()" onkeypress="return false;" onkeydown="return false;" />&nbsp;
-                            <input type=button id="p13NewFolderButton" disabled="disabled" value="New Folder" onclick="p13createfolder()" onkeypress="return false;" onkeydown="return false;" />&nbsp;
-                            <input type=button id="p13UploadButton" disabled="disabled" value="Upload" onclick="p13uploadFile()" onkeypress="return false;" onkeydown="return false;" />&nbsp;
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="background-color:#E4E9E7;height:28px">
-                        <div style=float:right>
-                            <select id=p13sortdropdown onchange=p13updateFiles()>
-                                <option value=1 selected="selected">Sort by name</option>
-                                <option value=2>Sort by size</option>
-                                <option value=3>Sort by date</option>
-                                <option value=4>Descend by name</option>
-                                <option value=5>Descend by size</option>
-                                <option value=6>Descend by date</option>
-                            </select>
-                        </div>
-                        <div>&nbsp;&nbsp;<span id="p13currentpath"></span></div>
-                    </td>
-                </tr>
-            </table>
-            <div id="p13filetable" style="width:100%;height:500px;overflow:auto;-webkit-user-select:none">
-                <div id="p13bigok" style="width:256px;overflow:hidden;position:absolute;left:337px;top:200px;text-align:center;font-size:1600%;color:#AAAAAA;display:none"><b>&checkmark;</b></div>
-                <div id="p13bigfail" style="width:256px;overflow:hidden;position:absolute;left:337px;top:200px;text-align:center;font-size:1600%;color:#AAAAAA;display:none"><b>&#10007;</b></div>
-                <span id="p13files"></span>
-            </div>
-            <table id="p13toolbarBottom" style=width:100% cellpadding=0 cellspacing=0>
-                <tr><td class=style6 style="text-align:left">&nbsp;<span id="bottomstatus"></span></td></tr>
-            </table>
-        </div>
-        <div id=p14 style=display:none>
-            <h1><span id=p14deviceName></span> - Intel&reg; AMT</h1>
-            <iframe id=p14iframe style="width:100%;height:650px;border:0;overflow:hidden" src="/commander.htm"></iframe>
-        </div>
-        <div id=p15 style=display:none>
-            <h1><span id=p15deviceName></span> - Console</h1>
-            <table cellpadding=0 cellspacing=0 style="width:100%;padding:0px;padding:0px;margin-top:0px">
-                <tr>
-                    <td style=background:#C0C0C0>
-                        <div style=float:right;padding-right:4px>
-                            <span id=p15coreName title="Information about current core running on this agent"></span>
-                            <input type=button id=p15uploadCore value="Change Core" onclick=p15uploadCore() title="Change the agent Java Script code module" />
-                        </div>
-                        <div id="p15statetext" style=padding:4px></div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <div style="background-color:gray"><div id="consoleprogressbar" style="height:2px;width:0%;background-color:red"></div></div>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="background:black;text-align:center;height:500px;position:relative">
-                        <div id="p15agentConsole" style="background:black;margin:0;padding:0;color:lightgray;width:100%;max-width:930px;height:100%;text-align:left;overflow-y:scroll"></div>
-                    </td>
-                </tr>
-                <tr>
-                    <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
-                        <table style="width:100%">
-                            <tr>
-                                <td style="width:99%">
-                                    <input id=p15consoleText list=p15history style="width:100%" onkeyup=p15consoleSend(event) />
-                                    <datalist id="p15history"></datalist>
-                                </td>
-                                <td>&nbsp;</td>
-                                <td style="width:1%"><input id="id_p15consoleClear" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="Clear" onclick="p15consoleClear()"></td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <div id=p20 style=display:none>
-            <h1><span id=p20meshName></span> - General</h1>
-            <p id=p20info></p>
-        </div>
-        <br id="column_l_bottomgap" />
-    </div>
-    <div id=footer>
-        <table cellpadding=0 cellspacing=10 style="width:100%">
-            <tr>
-                <td style="text-align:left"></td>
-                <td style="text-align:right"><a href="terms">Terms &amp; Privacy</a></td>
-            </tr>
-        </table>
-    </div>
-    <div id=dialog style="z-index:1000;background-color:#EEE;box-shadow:0px 0px 15px #666;font-family:Arial,Helvetica,sans-serif;border-radius:5px;position:fixed;top:160px;width:400px;display:none">
-        <div style="width:100%;background-color:#003366;color:#FFF;border-radius:5px 5px 0 0">
-            <div id=id_dialogclose style=float:right;padding:5px;cursor:pointer onclick=setDialogMode()><b>X</b></div>
-            <div id=id_dialogtitle style=padding:5px></div>
-            <div style=width:100%;margin:6px></div>
-        </div>
-        <div style="margin-right:16px;margin-left:8px">
-            <div id=dialog1 style="margin:auto;text-align:center;margin:3px">
-                <div id=id_dialogMessage style="padding:10px"></div>
-            </div>
-            <div id=dialog2 style="margin:auto;margin:3px">
-                <div id=id_dialogOptions></div>
-            </div>
-            <div id=dialog3 style="margin:auto;margin:3px">
-                <div style=height:26px>
-                    <select id=d3uploadMode style=float:right;width:260px onchange=d3modechange()>
-                        <option value=1>Local file upload</option>
-                        <option value=2>Server file selection</option>
-                    </select>
-                    <div>File Selection</div>
-                </div>
-                <div id=d3localmode style=height:26px;display:none>
-                    <form id=d3localmodeform method=post enctype=multipart/form-data action=uploadfile.ashx target=fileUploadFrame>
-                        <input type=text id=d3attrib name=attrib style=display:none />
-                        <input type=file id=d3localFile name=files style=float:right;width:260px onchange=d3setActions() />
-                        <input type=submit id=d3submit style=display:none />
-                    </form>
-                    <div>Upload File</div>
-                </div>
-                <div id=d3servermode>
-                    <div style="width:100%;background-color:#d3d9d6;text-align:left;padding:3px" valign=bottom>
-                        <input type=button id=p3FolderUp disabled="disabled" onclick=d3folderup() value="Up" />&nbsp;
-                    </div>
-                    <div id=d3serverfiles style="width:100%;height:150px;background-color:white;padding:2px;border:1px solid gray;overflow-y:scroll"></div>
-                </div>
-            </div>
-            <div id=dialog7 style="margin:auto;margin:3px">
-                <br>
-                <div style='height:26px'>
-                    <select id="d7desktopmode" style="float:right;width:200px">
-                        <option value="1">RLE8, Fastest</option>
-                        <option value="2">RLE16, Recommended</option>
-                        <option value="3">RAW8, Slow</option>
-                        <option value="4">RAW16, Very Slow</option>
-                    </select>
-                    <div>Image Encoding</div>
-                </div>
-                <div style="height:60px">
-                    <div style="float:right;border:1px solid #666;width:200px;height:60px;overflow-y:scroll;background-color:white">
-                        <input type="checkbox" id='d7showfocus'>Show Focus Tool<br>
-                        <input type="checkbox" id='d7showcursor'>Show Local Mouse Cursor<br>
-                        <input type="checkbox" id='d7showcad'>Show Ctrl-Alt-Del<br>
-                    </div>
-                    <div>Other Settings</div>
-                </div>
-            </div>
-        </div>
-        <div id="idx_dlgButtonBar" style="padding:10px;margin-bottom:4px">
-            <input id="idx_dlgCancelButton" type="button" value="Cancel" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">
-            <input id="idx_dlgOkButton" type="button" value="OK" style="float:right;width:80px" onclick="dialogclose(1)">
-            <div style="height:25px"><input id=idx_dlgDeleteButton type=button value=Delete style="width:80px;display:none" onclick="dialogclose(2)"></div>
-        </div>
-    </div>
-    <iframe name="fileUploadFrame" style=display:none></iframe>
-    <form style=display:none method=post action=uploadfile.ashx enctype=multipart/form-data target=fileUploadFrame><input id=p5fileDragName name="name"><input id=p5fileDragSize name="size"><input id=p5fileDragType name="type"><input id=p5fileDragData name="data"><input id=p5fileDragLink name="link"><input type=submit id=p5loginSubmit2 style=display:none /></form>
-    <form style=display:none method=post action=uploadnodefile.ashx enctype=multipart/form-data target=fileUploadFrame><input id=p13fileDragName name="name"><input id=p13fileDragSize name="size"><input id=p13fileDragType name="type"><input id=p13fileDragData name="data"><input id=p13fileDragLink name="link"><input type=submit id=p13loginSubmit2 style=display:none /></form>
-    <audio id="chimes"><source src="sounds/chimes.mp3" type="audio/mp3"></audio>
-    <script type="text/javascript">
-        var powerStatetable = ['', 'Powered', 'Sleep', 'Sleep', 'Sleep', 'Hibernating', 'Power off', 'Present'];
-        var StatusStrs = ['Disconnected', 'Connecting...', 'Setup...', 'Connected'];
-        var sort = 0;
-        var searchFocus = 0;
-        var showHostnames = false;
-        var meshserver = null;
-        var meshes = {};
-        var nodes = [];
-        var filetree = {};
-        var userinfo = null;
-        var serverinfo = null;
-        var events = [];
-        var users = null;
-        var wssessions = null;
-        var nodeShortIdent = 0;
-        var desktop;
-        var desktopsettings = { encoding: 2, showfocus: false, showmouse: true, showcad: true };
-        var terminal;
-        var files;
-        var debugLevel = {{{debuglevel}}};
-
-        function startup() {
-            // Guard against other site's top frames (web bugs).
-            var loc = null;
-            try { loc = top.location.toString().toLowerCase(); } catch (e) { }
-            if (top != self && (loc == null || top.active == false)) { top.location = self.location; return; }
-
-            // Setup page visuals
-            p1updateInfo();
-
-            // Setup the context menu
-            document.onclick = function (e) { hideContextMenu(); }
-            document.onkeypress = ondockeypress;
-            document.onkeydown = ondockeydown;
-            document.onkeyup = ondockeyup;
-            window.onresize = center;
-            center();
-
-            // Connect to the mesh server
-            meshserver = MeshServerCreateControl("{{{domainurl}}}");
-            meshserver.onStateChanged = onStateChanged;
-            meshserver.onMessage = onMessage;
-            meshserver.Start();
-
-            // Setup page controls
-            document.getElementById("sortselect").selectedIndex = sort = getstore("sort", 0);
-            Q('SearchInput').value = getstore("search", "");
-            showHostnames = (getstore("showHostnames", 1) == 1);
-            Q('HostnameCheckBox').checked = showHostnames;
-
-            // Display the page devices
-            onSortSelectChange();
-            onSearchInputChanged();
-            updateDevices();
-
-            // Setup upload drag & drop
-            Q('p5filetable').addEventListener("drop", p5fileDragDrop, false);
-            Q('p5filetable').addEventListener("dragover", p5fileDragOver, false);
-            Q('p5filetable').addEventListener("dragleave", p5fileDragLeave, false);
-
-            // Setup upload drag & drop
-            Q('p13filetable').addEventListener("drop", p13fileDragDrop, false);
-            Q('p13filetable').addEventListener("dragover", p13fileDragOver, false);
-            Q('p13filetable').addEventListener("dragleave", p13fileDragLeave, false);
-
-            // Timeline update interval
-            setInterval(updateDeviceTimeline, 120000); // Check every 2 minutes
-        }
-
-        function getNodeFromId(id) {
-            for (var i in nodes) { if (nodes[i]._id == id) return nodes[i]; }
-            return null;
-        }
-
-        function reload() { window.location.href = window.location.href; }
-
-        function onStateChanged(server, state) {
-            if (state == 0) {
-                // Control web socket disconnected
-                go(0);
-
-                // Clean up
-                powerTimeline = null;
-                powerTimelineReq = null;
-                powerTimelineNode = null;
-                powerTimelineUpdate = null;
-                deleteAllNotifications(); // Close and clear notifications if present
-                setDialogMode(0); // Close any dialog boxes if present
-                hideContextMenu(); // Hide the context menu if present
-            } else if (state == 2) {
-                // Fetch list of meshes, nodes, files
-                meshserver.Send({ action: 'meshes' });
-                meshserver.Send({ action: 'nodes' });
-                meshserver.Send({ action: 'files' });
-            }
-        }
-
-        function updateSiteAdmin() {
-            // Update account actions
-            QV('p2ServerActions', userinfo.siteadmin & 5);
-            QV('p2ServerActionsBackup', userinfo.siteadmin & 1);
-            QV('p2ServerActionsRestore', userinfo.siteadmin & 4);
-            QV('MainMenuMyFiles', userinfo.siteadmin & 8);
-            if (((userinfo.siteadmin & 8) == 0) && (xxcurrentView == 5)) { go(1); }
-
-            // Update user management state
-            if ((userinfo.siteadmin & 2) != 0)
-            {
-                // We are user administrator
-                if (users == null) { meshserver.Send({ action: 'users' }); }
-                if (wssessions == null) { meshserver.Send({ action: 'wssessioncount' }); }
-            } else {
-                // We are not user administrator
-                users = null;
-                wssessions = null;
-                updateUsers();
-                if (xxcurrentView == 4) go(1);
-            }
-            meshserver.Send({ action: 'events' });
-            QV('p2deleteall', userinfo.siteadmin == 0xFFFFFFFF);
-        }
-
-        function onMessage(server, message) {
-            switch (message.action) {
-                case 'userinfo': {
-                    userinfo = message.userinfo;
-                    updateSiteAdmin();
-                    break;
-                }
-                case 'serverinfo': {
-                    serverinfo = message.serverinfo;
-                    break;
-                }
-                case 'users': {
-                    users = {};
-                    for (var m in message.users) { users[message.users[m]._id] = message.users[m]; }
-                    updateUsers();
-                    break;
-                }
-                case 'wssessioncount': {
-                    wssessions = message.wssessions;
-                    updateUsers();
-                    break;
-                }
-                case 'meshes': {
-                    meshes = {};
-                    for (var m in message.meshes) { meshes[message.meshes[m]._id] = message.meshes[m]; }
-                    updateMeshes();
-                    updateDevices();
-                    break;
-                }
-                case 'files': {
-                    filetree = setupBackPointers(message.filetree);
-                    updateFiles();
-                    d3updatefiles();
-                    break;
-                }
-                case 'nodes': {
-                    nodes = [];
-                    for (var m in message.nodes) {
-                        for (var n in message.nodes[m]) {
-                            if (!meshes[m]) { console.log('Invalid mesh (1): ' + m); continue; }
-                            message.nodes[m][n].namel = message.nodes[m][n].name.toLowerCase();
-                            if (message.nodes[m][n].host) { message.nodes[m][n].hostl = message.nodes[m][n].host.toLowerCase(); } else { message.nodes[m][n].hostl = message.nodes[m][n].namel; }
-                            message.nodes[m][n].meshnamel = meshes[m].name.toLowerCase();
-                            message.nodes[m][n].meshid = m;
-                            message.nodes[m][n].state = (message.nodes[m][n].state)?(message.nodes[m][n].state):0;
-                            message.nodes[m][n].desc = message.nodes[m][n].desc;
-                            if (!message.nodes[m][n].icon) message.nodes[m][n].icon = 1;
-                            message.nodes[m][n].ident = ++nodeShortIdent;
-                            nodes.push(message.nodes[m][n]);
-                        }
-                    }
-                    onSortSelectChange();
-                    onSearchInputChanged();
-                    updateDevices();
-                    if (xxcurrentView == 0) { if ('{{viewmode}}' != '') { go({{viewmode}}); } else { go(1); } }
-                    if ('{{currentNode}}' != '') { gotoDevice('{{currentNode}}',{{viewmode}});}
-                    break;
-                }
-                case 'powertimeline': {
-                    if (message.nodeid != powerTimelineReq) break;
-                    powerTimelineNode = message.nodeid;
-                    powerTimeline = message.timeline;
-                    powerTimelineUpdate = Date.now() + 300000; // Update every 5 minutes
-                    if (currentNode._id == message.nodeid) { drawDeviceTimeline(); }
-                    break;
-                }
-                case 'msg': {
-                    // Check if this is a message from a node
-                    if (message.nodeid != undefined) {
-                        var index = -1;
-                        for (var i in nodes) { if (nodes[i]._id == message.nodeid) { index = i; break; } }
-                        if (index != -1) {
-                            // Node was found, dispatch the message
-                            if (message.type == 'console') { p15consoleReceive(nodes[index], message.value); } // This is a console message.
-                            if (message.type == 'notify') { // This is a notification message.
-                                var n = { text:message.value };
-                                if (message.nodeid != undefined) { n.nodeid = message.nodeid; }
-                                if (message.tag != undefined) { n.tag = message.tag; }
-                                addNotification(n);
-                            } 
-                        }
-                    }
-                    break;
-                }
-                case 'events': {
-                    events = message.events;
-                    events_update();
-                    break;
-                }
-                case 'event': {
-                    if (!message.event.nolog) { events.unshift(message.event); events_update(); }
-                    switch (message.event.action) {
-                        case 'accountcreate':
-                        case 'accountchange': {
-                            // An account was created or changed
-                            if (userinfo.name == message.event.account.name) {
-                                var newsiteadmin = message.event.account.siteadmin?message.event.account.siteadmin:0;
-                                var oldsiteadmin = userinfo.siteadmin?userinfo.siteadmin:0;
-                                if ((message.event.account.quota != userinfo.quota) || (((userinfo.siteadmin & 8) == 0) && ((message.event.account.siteadmin & 8) != 0))) { meshserver.Send({ action: 'files' }); }
-                                userinfo = message.event.account;
-                                if (oldsiteadmin != newsiteadmin) updateSiteAdmin();
-                            }
-                            if (users == null) break;
-                            users[message.event.account._id] = message.event.account;
-                            updateUsers();
-                            break;
-                        }
-                        case 'accountremove': {
-                            // An account was removed
-                            if (users == null) break;
-                            delete users['user/{{{domain}}}/' + message.event.username.toLowerCase()];
-                            updateUsers();
-                            break;
-                        }
-                        case 'createmesh': {
-                            // A new mesh was created
-                            if (message.event.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()] != undefined) { // Check if this is a mesh create for a mesh we own. If site administrator, we get all messages so need to ignore some.
-                                meshes[message.event.meshid] = { _id: message.event.meshid, name: message.event.name, mtype: message.event.mtype, desc: message.event.desc, links: message.event.links };
-                                updateMeshes();
-                                updateDevices();
-                                meshserver.Send({ action: 'files' });
-                            }
-                            break;
-                        }
-                        case 'meshchange': {
-                            // Update mesh information
-                            if (meshes[message.event.meshid] == undefined) {
-                                // This is a new mesh for us
-                                meshes[message.event.meshid] = { _id: message.event.meshid, name: message.event.name, mtype: message.event.mtype, desc: message.event.desc, links: message.event.links };
-                                meshserver.Send({ action: 'nodes' }); // Request a refresh of all nodes (TODO: We could optimize this to only request nodes for the new mesh).
-                            } else {
-                                // This is an existing mesh
-                                meshes[message.event.meshid].name = message.event.name;
-                                meshes[message.event.meshid].desc = message.event.desc;
-                                meshes[message.event.meshid].links = message.event.links;
-
-                                // Check if we lost rights to this mesh in this change.
-                                if (meshes[message.event.meshid].links['user/{{{domain}}}/' + userinfo.name.toLowerCase()] == undefined) {
-                                    if ((xxcurrentView == 20) && (currentMesh == meshes[message.event.meshid])) go(2);
-                                    delete meshes[message.event.meshid];
-
-                                    // Delete all nodes in that mesh
-                                    var newnodes = [];
-                                    for (var i in nodes) { if (nodes[i].meshid != message.event.meshid) { newnodes.push(nodes[i]); } }
-                                    nodes = newnodes;
-
-                                    // If we are looking at a node in the deleted mesh, move back to "My Devices"
-                                    if (xxcurrentView >= 10 && xxcurrentView < 20 && currentNode && currentNode.meshid == message.event.meshid) go(1);
-                                }
-                            }
-                            updateMeshes();
-                            updateDevices();
-                            meshserver.Send({ action: 'files' });
-
-                            // If we are looking at a mesh that is now deleted, move back to "My Account"
-                            if (xxcurrentView == 20 && currentMesh._id == message.event.meshid) { p20updateMesh(); }
-                            break;
-                        }
-                        case 'deletemesh': {
-                            // Delete the mesh
-                            if (meshes[message.event.meshid]) {
-                                delete meshes[message.event.meshid];
-                                updateMeshes();
-                                meshserver.Send({ action: 'files' });
-                            }
-
-                            // Delete all nodes in that mesh
-                            var newnodes = [];
-                            for (var i in nodes) { if (nodes[i].meshid != message.event.meshid) { newnodes.push(nodes[i]); } }
-                            nodes = newnodes;
-                            updateDevices();
-
-                            // If we are looking at a mesh that is now deleted, move back to "My Account"
-                            if (xxcurrentView >= 20 && xxcurrentView < 30 && currentMesh._id == message.event.meshid) go(2);
-                            // If we are looking at a node in the deleted mesh, move back to "My Devices"
-                            if (xxcurrentView >= 10 && xxcurrentView < 20 && currentNode && currentNode.meshid == message.event.meshid) go(1);
-
-                            break;
-                        }
-                        case 'addnode': {
-                            var node = message.event.node;
-                            if (!meshes[node.meshid]) break; // This is a node for a mesh we don't know. Happens when we are site administrator, we get all messages.
-                            node.namel = node.name.toLowerCase();
-                            if (node.host) { node.hostl = node.host.toLowerCase(); } else { node.hostl = node.namel; }
-                            node.meshnamel = meshes[node.meshid].name.toLowerCase();
-                            node.state = 0;
-                            if (!node.icon) node.icon = 1;
-                            node.ident = ++nodeShortIdent;
-                            nodes.push(node);
-                            onSortSelectChange();
-                            onSearchInputChanged();
-                            updateDevices();
-                            break;
-                        }
-                        case 'removenode': {
-                            var index = -1;
-                            for (var i in nodes) { if (nodes[i]._id == message.event.nodeid) { index = i; break; } }
-                            if (index != -1) {
-                                var node = nodes[index];
-                                if (currentNode == node) {
-                                    if (xxcurrentView >= 10 && xxcurrentView < 20) { go(1); }
-                                    delete currentNode; // TODO: Correctly disconnect from this node (Desktop/Terminal/Files...)
-                                }
-                                nodes.splice(index, 1);
-                                updateDevices();
-                            }
-                            break;
-                        }
-                        case 'changenode': {
-                            var index = -1;
-                            for (var i in nodes) { if (nodes[i]._id == message.event.nodeid) { index = i; break; } }
-                            if (index != -1) {
-                                var node = nodes[index];
-
-                                // Change the node
-                                node.name = message.event.node.name;
-                                node.host = message.event.node.host;
-                                node.desc = message.event.node.desc;
-                                if (message.event.node.agent != undefined) {
-                                    if (node.agent == undefined) node.agent = {};
-                                    if (message.event.node.agent.ver != undefined) { node.agent.ver = message.event.node.agent.ver; }
-                                    if (message.event.node.agent.id != undefined) { node.agent.id = message.event.node.agent.id; }
-                                    if (message.event.node.agent.caps != undefined) { node.agent.caps = message.event.node.agent.caps; }
-                                    if (message.event.node.agent.core != undefined) { node.agent.core = message.event.node.agent.core; } else { if (node.agent.core) { delete node.agent.core; } }
-                                }
-                                if (message.event.node.intelamt != undefined) {
-                                    if (node.intelamt == undefined) node.intelamt = {};
-                                    if (message.event.node.intelamt.host != undefined) { node.intelamt.user = message.event.node.intelamt.host; }
-                                    if (message.event.node.intelamt.user != undefined) { node.intelamt.user = message.event.node.intelamt.user; }
-                                    if (message.event.node.intelamt.tls != undefined) { node.intelamt.tls = message.event.node.intelamt.tls; }
-                                    if (message.event.node.intelamt.ver != undefined) { node.intelamt.ver = message.event.node.intelamt.ver; }
-                                    if (message.event.node.intelamt.state != undefined) { node.intelamt.state = message.event.node.intelamt.state; }
-                                }
-                                node.namel = node.name.toLowerCase();
-                                if (node.host) { node.hostl = node.host.toLowerCase(); } else { node.hostl = node.namel; }
-                                if (message.event.node.icon) { node.icon = message.event.node.icon; }
-
-                                updateDevices();
-                                drawNotifications();
-                                refreshDevice(node._id);
-                            }
-                            break;
-                        }
-                        case 'nodeconnect': {
-                            // Indicated a node has changed connectivity state
-                            var index = -1;
-                            for (var i in nodes) { if (nodes[i]._id == message.event.nodeid) { index = i; break; } }
-                            if (index != -1) {
-                                var node = nodes[index];
-
-                                // Change the node connection state
-                                node.conn = message.event.conn;
-                                node.pwr = message.event.pwr;
-                                if (message.event.agct != undefined) { node.agct = message.event.agct; }
-                                if (message.event.cict != undefined) { node.cict = message.event.cict; }
-                                updateDevices();
-                                refreshDevice(node._id);
-                            }
-                            break;
-                        }
-                        case 'wssessioncount': {
-                            // Update the active web socket session count for a user
-                            if (wssessions != null) {
-                                if (message.event.count == 0 && wssessions['user/{{{domain}}}/' + message.event.username]) {
-                                    delete wssessions['user/{{{domain}}}/' + message.event.username];
-                                } else {
-                                    wssessions['user/{{{domain}}}/' + message.event.username] = message.event.count;
-                                }
-                                updateUsers();
-                            }
-                            break;
-                        }
-                        case 'clearevents': {
-                            events = [];
-                            events_update();
-                            break;
-                        }
-                        case 'login': {
-                            // Update the last login time
-                            if (users != null && users['user/{{{domain}}}/' + message.event.username]) { users['user/{{{domain}}}/' + message.event.username].login = message.event.time; }
-                            break;
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-
-        //
-        // MY DEVICES
-        //
-
-        function onHostnameCheckBox() {
-            showHostnames = Q('HostnameCheckBox').checked;
-            putstore("showHostnames", showHostnames ? 1 : 0);
-            onSortSelectChange();
-            return;
-        }
-
-        function ondockeypress(e) {
-            if (!xxdialogMode && xxcurrentView == 11 && desktop && desktop.State == 3) return desktop.m.handleKeys(e);
-            if (!xxdialogMode && xxcurrentView == 12 && terminal && terminal.State == 3) return terminal.m.TermHandleKeys(e);
-            if (xxdialogMode || xxcurrentView != 1) return;
-            if (e.ctrlKey == true && e.charCode == 96) {
-                showHostnames = !showHostnames;
-                Q('HostnameCheckBox').value = showHostnames;
-                putstore("showHostnames", showHostnames ? 1 : 0);
-                onSortSelectChange();
-                return;
-            }
-            if (e.ctrlKey == true || e.altKey == true || e.metaKey == true) return;
-            var processed = 0;
-            if (e.key) {
-                if (e.key.length === 1 && searchFocus == 0) { Q('SearchInput').value = ((Q('SearchInput').value + e.key)); processed = 1; }
-                if (e.key === 'Backspace' && searchFocus == 0) { var x = Q('SearchInput').value; Q('SearchInput').value = x.substring(0, x.length - 1); processed = 1; }
-                if (e.key === 'Esc') { Q('SearchInput').value = ''; processed = 1; }
-            } else {
-                if (e.charCode != 0 && searchFocus == 0) { Q('SearchInput').value = ((Q('SearchInput').value + String.fromCharCode(e.charCode))); processed = 1; }
-            }
-            if (processed > 0) { if (processed == 1) { onSearchInputChanged(); } if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false; }
-        }
-
-        function ondockeydown(e) {
-            if (!xxdialogMode && xxcurrentView == 11 && desktop && desktop.State == 3) return desktop.m.handleKeyDown(e);
-            if (!xxdialogMode && xxcurrentView == 12 && terminal && terminal.State == 3) return terminal.m.TermHandleKeyDown(e);
-            if (xxdialogMode || xxcurrentView != 1 || e.ctrlKey == true || e.altKey == true || e.metaKey == true) return;
-            var processed = 0;
-            if (e.keyCode === 8 && searchFocus == 0) { var x = Q('SearchInput').value; Q('SearchInput').value = (x.substring(0, x.length - 1)); processed = 1; }
-            if (e.keyCode === 27) { Q('SearchInput').value = ''; processed = 1; }
-            if (processed > 0) { if (processed == 1) { onSearchInputChanged(); } if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false; }
-        }
-
-        function ondockeyup(e) {
-            if (!xxdialogMode && xxcurrentView == 11 && desktop && desktop.State == 3) return desktop.m.handleKeyUp(e);
-            if (!xxdialogMode && xxcurrentView == 12 && terminal && terminal.State == 3) return terminal.m.TermHandleKeyUp(e);
-            if (xxdialogMode || xxcurrentView != 0 || e.ctrlKey == true || e.altKey == true || e.metaKey == true) return;
-            if ((e.keyCode === 8 && searchFocus == 0) || e.keyCode === 27) { if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false; }
-        }
-
-        var deviceHeaderId = 0;
-        var deviceHeaderCount;
-        var deviceHeaders = {};
-
-        function updateDevices() {
-            var r = "", c = 0, current = null, count = 0, displayedMeshes = {};
-            deviceHeaderId = 0;
-            deviceHeaderCount = {};
-            deviceHeaderTotal = 0;
-            deviceHeaders = {};
-            deviceHeadersTitles = {};
-            for (var i in nodes) {
-                if (nodes[i].v == false) continue;
-                var mesh2 = meshes[nodes[i].meshid], meshlinks = mesh2.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()];
-                if (meshlinks == undefined) continue;
-                if (sort == 0) {
-                    // Mesh header
-                    if (nodes[i].meshid != current) {
-                        deviceHeaderSet();
-                        var meshrights = meshlinks.rights;
-                        if (current != null) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } r += '</tr></table>'; }
-                        r += '<table style=width:100%;padding-top:4px cellpadding=0 cellspacing=0><tr><td colspan=3 class=DevSt><span style=float:right>';
-                        r += getMeshActions(mesh2, meshrights);
-                        r += '</span><span id=MxMESH style=cursor:pointer onclick=gotoMesh("' + nodes[i].meshid + '")>' + EscapeHtml(meshes[nodes[i].meshid].name) + '</span><span id=DevxHeader' + deviceHeaderId + ' class=devHeaderx></span></td></tr><tr>';
-                        current = nodes[i].meshid;
-                        displayedMeshes[current] = 1;
-                        c = 0;
-                    }
-                } else if (sort == 1) {
-                    // Power header
-                    if (nodes[i].state != current) {
-                        deviceHeaderSet();
-                        if (current != null) { if (c == 2) { r += '<td><div style=width:301px></div></td>'; } r += '</tr></table>'; }
-                        r += '<table style=width:100%;padding-top:4px cellpadding=0 cellspacing=0><tr><td colspan=3 class=DevSt><span>' + PowerStateStr2(nodes[i].state) + '</span><span id=DevxHeader' + deviceHeaderId + ' class="devHeaderx"></span></td></tr><tr>';
-                        current = nodes[i].state;
-                        c = 0;
-                    }
-                } else if (sort == 2) {
-                    // Device header
-                    if (current == null) { r += '<table style=width:100%;padding-top:4px cellpadding=0 cellspacing=0><tr>'; current = '1'; }
-                }
-
-                // Node positioning
-                if (c > 2) { r += '</tr><tr>'; c = 0; }
-                c++;
-                count++;
-
-                var title = EscapeHtml(nodes[i].name);
-                if (nodes[i].host != undefined) title += " / " + EscapeHtml(nodes[i].host);
-                var name = EscapeHtml(nodes[i].name);
-                if (showHostnames == true && nodes[i].host != undefined) name = EscapeHtml(nodes[i].host);
-
-                // Node
-                var icon = nodes[i].icon;
-                var nodestate = NodeStateStr(nodes[i]);
-                if ((!nodes[i].conn) || (nodes[i].conn == 0)) { icon += ' gray'; }
-                r += '<td><div id=devs style=width:301px;height:50px;padding-top:1px;padding-bottom:1px><div style=width:22px;height:50%;float:left;padding-top:12px><input class="' + nodes[i].meshid + ' DeviceCheckbox" onclick=p1updateInfo() value=devid_' + nodes[i]._id + ' type=checkbox></div><div style=height:100%;cursor:pointer onclick=gotoDevice(\'' + nodes[i]._id + '\')><div class="i' + icon + '" style=width:50px;float:left></div><div style=height:100%><div class=g1></div><div class=e2><div class=e1 title="' + title + '">' + name + '</div><div>' + nodestate + '</div></div><div class=g2></div></div></div></div></td>';
-                deviceHeaderTotal++;
-                if (typeof deviceHeaderCount[nodes[i].state] == 'undefined') { deviceHeaderCount[nodes[i].state] = 1; } else { deviceHeaderCount[nodes[i].state]++; }
-            }
-
-            if (c == 2) r += '<td><div style=width:301px></div></td>'; // Adds device padding
-
-            // Display all empty meshes, we need to do this because users can add devices to these at any time.
-            if (sort == 0 && Q('SearchInput').value == '') {
-                for (var i in meshes) {
-                    var mesh = meshes[i], meshlink = mesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()];
-                    if (meshlink != undefined) {
-                        var meshrights = meshlink.rights;
-                        if (displayedMeshes[mesh._id] == undefined) {
-                            if (current != '') { r += '</tr></table>'; }
-                            r += '<table style=width:100%;padding-top:4px cellpadding=0 cellspacing=0><tr><td colspan=3 class=DevSt><span style=float:right>';
-                            r += getMeshActions(mesh, meshrights);
-                            r += '</span><span id=MxMESH style=cursor:pointer onclick=gotoMesh("' + mesh._id + '")>' + EscapeHtml(mesh.name) + '</span></td></tr><tr>';
-                            if (mesh.mtype == 1) {
-                                r += '<td><div style=padding:10px><i>No Intel&reg; AMT devices in this mesh';
-                                if ((meshrights & 4) != 0) { r += ', <a style=cursor:pointer onclick=addDeviceToMesh(\"' + mesh._id + '\")>add one</a>'; }
-                            }
-                            if (mesh.mtype == 2) {
-                                r += '<td><div style=padding:10px><i>No devices in this mesh';
-                                if ((meshrights & 4) != 0) { r += ', <a style=cursor:pointer onclick=addAgentToMesh(\"' + mesh._id + '\")>add one</a>'; }
-                            }
-                            r += '.</i></div></td>';
-                            current = mesh._id;
-                            count++;
-                        }
-                    }
-                }
-            }
-            r += '</tr></table>';
-
-            QH('xdevices', r);
-            deviceHeaderSet();
-            QV('NoNodesPanel', count == 0);
-
-            for (var i in deviceHeaders) { QH(i, deviceHeaders[i]); }
-            for (var i in deviceHeadersTitles) { Q(i).title = deviceHeadersTitles[i]; }
-        }
-
-        function getMeshActions(mesh, meshrights) {
-            if ((meshrights & 4) == 0) return '';
-            var r = '';
-            if (mesh.mtype == 1) {
-                r += ' <a style=cursor:pointer;font-size:10px title="Add a new Intel&reg; AMT computer that is located on the internet." onclick=addCiraDeviceToMesh(\"' + mesh._id + '\")>Add CIRA</a>';
-                r += ' <a style=cursor:pointer;font-size:10px title="Add a new Intel&reg; AMT computer that is located on the local network." onclick=addDeviceToMesh(\"' + mesh._id + '\")>Add Local</a>';
-            }
-            if (mesh.mtype == 2) {
-                r += ' <a style=cursor:pointer;font-size:10px title="Add a new computer to this mesh by installing the mesh agent." onclick=addAgentToMesh(\"' + mesh._id + '\")>Add Agent</a>';
-            }
-            return r;
-        }
-
-        function addDeviceToMesh(meshid) {
-            if (xxdialogMode) return;
-            var mesh = meshes[meshid];
-            var x = "Add a new Intel&reg; AMT device to mesh " + EscapeHtml(mesh.name) + ".<br /><br />";
-            x += addHtmlValue('Device Name', '<input id=dp1devicename style=width:230px maxlength=32 autocomplete=off onchange=validateDeviceToMesh() onkeyup=validateDeviceToMesh() />');
-            x += addHtmlValue('Hostname', '<input id=dp1hostname style=width:230px maxlength=32 autocomplete=off placeholder="Same as device name" onchange=validateDeviceToMesh() onkeyup=validateDeviceToMesh() />');
-            x += addHtmlValue('Username', '<input id=dp1username style=width:230px maxlength=32 autocomplete=off placeholder="admin" onchange=validateDeviceToMesh() onkeyup=validateDeviceToMesh() />');
-            x += addHtmlValue('Password', '<input id=dp1password type=password style=width:230px autocomplete=off maxlength=32 onchange=validateDeviceToMesh() onkeyup=validateDeviceToMesh() />');
-            x += addHtmlValue('Security', '<select id=dp1tls style=width:236px><option value=0>No TLS security</option><option value=1>TLS security required</option></select>');
-            setDialogMode(2, "Add Intel&reg; AMT device", 3, addDeviceToMeshEx, x, meshid);
-            validateDeviceToMesh();
-        }
-
-        function addCiraDeviceToMesh(meshid) {
-            if (xxdialogMode) return;
-            var mesh = meshes[meshid];
-            var meshidx = meshid.substring(5);
-            if (meshidx[0] == '/') meshidx = meshidx.substring(1);
-            var x = "To add a new Intel&reg; AMT device to mesh " + EscapeHtml(mesh.name) + " with CIRA, load the following certificate as trusted root within Intel AMT, authenticate using a client certificate with the following common name and connect to the following server.<br /><br />";
-            x += addHtmlValue('Root Certificate', '<a href="MeshServerRootCert.cer" target="_blank">Root Certificate File</a>');
-            x += addHtmlValue('Organization', '<input style=width:230px readonly value="' + meshidx + '" />');
-            if (serverinfo != null) {
-                x += addHtmlValue('MPS Server', '<input style=width:230px readonly value="' + serverinfo.name + ':' + serverinfo.mpsport + '" />');
-            }
-            setDialogMode(2, "Add Intel&reg; AMT CIRA device", 1, null, x);
-        }
-
-        function addAgentToMesh(meshid) {
-            if (xxdialogMode) return;
-            var mesh = meshes[meshid];
-            var meshidx = meshid.substring(5);
-            if (meshidx[0] == '/') meshidx = meshidx.substring(1);
-            var x = "To add a new computer to mesh " + EscapeHtml(mesh.name) + ", download the mesh agent and configuration file and install the agent on the computer to manage.<br /><br />";
-            x += addHtmlValue('Mesh Agent', '<a href="meshagent?id=1" target="_blank">Windows executable (.exe)</a>');
-            x += addHtmlValue('Settings File', '<a href="meshsettings?id=' + meshid.split('/')[2] + '" target="_blank">' + EscapeHtml(mesh.name) + ' settings (.msh)</a>');
-            setDialogMode(2, "Add Mesh Agent", 1, null, x);
-        }
-
-        function validateDeviceToMesh() {
-            QE('idx_dlgOkButton', (Q('dp1devicename').value.length > 0) && (passwordcheck(Q('dp1password').value)));
-        }
-
-        function addDeviceToMeshEx(button, meshid) {
-            var amtuser = Q('dp1username').value;
-            if (amtuser == '') amtuser = 'admin';
-            var host = Q('dp1hostname').value;
-            if (host == '') host = Q('dp1devicename').value;
-            meshserver.Send({ action: 'addamtdevice', meshid: meshid, devicename: Q('dp1devicename').value, hostname: host, amtusername: amtuser, amtpassword: Q('dp1password').value, amttls: Q('dp1tls').value });
-        }
-
-        function deviceHeaderSet() {
-            if (deviceHeaderId == 0) { deviceHeaderId = 1; return; }
-            deviceHeaders["DevxHeader" + deviceHeaderId] = ', ' + deviceHeaderTotal + ((deviceHeaderTotal == 1) ? ' node' : ' nodes');
-            var title = '';
-            for (x in deviceHeaderCount) { if (title.length > 0) title += ', '; title += deviceHeaderCount[x] + ' ' + PowerStateStr2(x); }
-            deviceHeadersTitles["DevxHeader" + deviceHeaderId] = title;
-            deviceHeaderId++;
-            deviceHeaderCount = {};
-            deviceHeaderTotal = 0;
-        }
-
-        var powerStateStrings = ['', '<span title="Device is powered on.">Powered</span>', '<span title="Device is in sleep state (S1).">Sleeping</span>', '<span title="Device is in sleep state (S2).">Sleeping</span>', '<span title="Device is in deep sleep state (S3).">Deep Sleep</span>', '<span title="Device is in hibernating state (S4).">Hibernating</span>', '<span title="Device is in powered off state (S5).">Soft-Off</span>', '<span title="Device is detected but power state could not be obtained.">Present</span>'];
-        var powerStateStrings2 = ['', 'Device is powered', 'Device is in sleep state (S1)', 'Device is in sleep state (S2)', 'Device is in deep sleep state (S3)', 'Device is hibernating (S4)', 'Device is in soft-off state (S5)', 'Device is present, but power state cannot be determined'];
-        var powerColorTable = ['#00000000', 'black', 'blue', 'blue', 'lightblue', 'blueviolet', 'darkgreen', 'lightseagreen'];
-        function NodeStateStr(node) {
-            var states = [];
-            if (node.state > 0 && node.state < powerStatetable.length) state.push(powerStatetable[node.state]);
-            if (node.conn) {
-                if ((node.conn & 1) != 0) states.push('<span title="Mesh agent is connected and ready for use.">Agent</span>');
-                if ((node.conn & 2) != 0) states.push('<span title="Intel&reg; AMT CIRA is connected and ready for use.">CIRA</span>');
-                if ((node.conn & 4) != 0) states.push('<span title="Intel&reg; AMT is routable and ready for use.">AMT</span>');
-                if ((node.conn & 8) != 0) states.push('<span title="Mesh agent is reachable using another agent as relay.">Relay</span>');
-            }
-            if ((node.pwr != undefined) && (node.pwr != 0)) { states.push(powerStateStrings[node.pwr]); }
-            return states.join(', ');
-        }
-
-        function PowerStateStr(x) {
-            if (x < powerStatetable.length) return powerStatetable[x];
-            return '';
-        }
-
-        function PowerStateStr2(x) {
-            if ((x != 0) && (x < powerStatetable.length)) return powerStatetable[x];
-            return 'Unknown';
-        }
-
-        function selectallButtonFunction() {
-            var elements = document.getElementsByClassName("DeviceCheckbox"), checkcount = 0;
-            for (var i in elements) { if (elements[i].checked) checkcount++; }
-            for (var i in elements) { elements[i].checked = (checkcount == 0); }
-            p1updateInfo();
-        }
-
-        function p1updateInfo() {
-            var elements = document.getElementsByClassName("DeviceCheckbox"), checkcount = 0;
-            for (var i in elements) { if (elements[i].checked) checkcount++; }
-            if (checkcount > 0) {
-                QE('GroupActionButton', true);
-                Q('SelectAllButton').value = 'Select None';
-                QV('cxmgroupsplit', true);
-                QV('cxmdesktop', true);
-            } else {
-                QE('GroupActionButton', false);
-                Q('SelectAllButton').value = 'Select All';
-                QV('cxmgroupsplit', false);
-                QV('cxmdesktop', false);
-            }
-        }
-
-        function groupActionFunction() {
-            // TODO
-            setDialogMode(2, "Group Action", 1, null, "This is a test");
-        }
-
-        function onSortSelectChange() {
-            sort = document.getElementById("sortselect").selectedIndex;
-            putstore("sort", sort);
-            if (sort == 0) { nodes.sort(meshSort); }
-            if (sort == 1) { nodes.sort(powerSort); }
-            if (sort == 2) { if (showHostnames == true) { nodes.sort(deviceHostSort); } else { nodes.sort(deviceSort); } }
-            updateDevices();
-        }
-
-        function meshSort(a, b) { if (a.meshnamel > b.meshnamel) return 1; if (a.meshnamel < b.meshnamel) return -1; if (a.meshid == b.meshid) { if (showHostnames == true) { if (a.hostl > b.hostl) return 1; if (a.hostl < b.hostl) return -1; return 0; } else { if (a.namel > b.namel) return 1; if (a.namel < b.namel) return -1; return 0; } } return 0; }
-        function powerSort(a, b) { if (a.state == b.state) { if (showHostnames == true) { if (a.hostl > b.hostl) return 1; if (a.hostl < b.hostl) return -1; return 0; } else { if (a.namel > b.namel) return 1; if (a.namel < b.namel) return -1; return 0; } } if (a.state > b.state) return 1; if (a.state < b.state) return -1; return 0; }
-        function deviceSort(a, b) { if (a.namel > b.namel) return 1; if (a.namel < b.namel) return -1; return 0; }
-        function deviceHostSort(a, b) { if (a.hostl > b.hostl) return 1; if (a.hostl < b.hostl) return -1; return 0; }
-        function onSearchInputChanged() { var x = Q('SearchInput').value.toLowerCase(); putstore("search", x); if (x == '') { for (var d in nodes) { nodes[d].v = true; } } else { for (var d in nodes) { nodes[d].v = (nodes[d].name.toLowerCase().indexOf(x) >= 0) || (nodes[d].hostl != undefined && nodes[d].hostl.toLowerCase().indexOf(x) >= 0); } } updateDevices(); }
-        function onSearchFocus(x) { searchFocus = x; }
-
-        var contextelement = null;
-        function handleContextMenu(event) {
-            hideContextMenu();
-            var scrollLeft = (window.pageXOffset !== undefined) ? window.pageXOffset : (document.documentElement || document.body.parentNode || document.body).scrollLeft;
-            var scrollTop = (window.pageYOffset !== undefined) ? window.pageYOffset : (document.documentElement || document.body.parentNode || document.body).scrollTop;
-            var elem = document.elementFromPoint(event.pageX - scrollLeft, event.pageY - scrollTop);
-            if (elem && elem != null && elem.id == "MxMESH") {
-                contextelement = elem;
-                var contextmenudiv = document.getElementById("meshContextMenu");
-                contextmenudiv.style.left = event.pageX + "px";
-                contextmenudiv.style.top = event.pageY + "px";
-                contextmenudiv.style.display = "block";
-            } else {
-                while (elem && elem != null && elem.id != "devs") { elem = elem.parentElement; }
-                if (!elem || elem == null) return true;
-                contextelement = elem;
-                var contextmenudiv = document.getElementById("contextMenu");
-                contextmenudiv.style.left = event.pageX + "px";
-                contextmenudiv.style.top = event.pageY + "px";
-                contextmenudiv.style.display = "block";
-            }
-            event.preventDefault();
-            return false;
-        }
-
-        function cmaction(action) {
-            var nodeid = contextelement.children[1].attributes.onclick.value;
-            nodeid = nodeid.substring(12, nodeid.length - 2);
-            if (action == 1) gotoDevice(nodeid, 10); // General
-            if (action == 2) gotoDevice(nodeid, 12); // Desktop
-            if (action == 3) gotoDevice(nodeid, 11); // Terminal
-            if (action == 4) gotoDevice(nodeid, 13); // Files
-            if (action == 5) gotoDevice(nodeid, 15); // Console
-            //if (action == 6) {
-            //var nodes = "";
-            //$(":checkbox").each(function () { if ($(this).is(':checked')) { nodes += ($(this).val() + ";"); } });
-            //window.location = "multidesktop.aspx?node=" + nodes + "&auto=1";
-            //}
-        }
-
-        function cmmeshaction(action) {
-            var meshid = contextelement.attributes.onclick.value.substring(32, (32 + 69));
-            var elements = document.getElementsByClassName("DeviceCheckbox");
-            if (action == 1) { for (var i in elements) { if (elements[i].attributes && elements[i].attributes.class.value.substring(0, 69) == meshid) { elements[i].checked = true; } } }
-            if (action == 2) { for (var i in elements) { if (elements[i].attributes && elements[i].attributes.class.value.substring(0, 69) == meshid) { elements[i].checked = false; } } }
-            //if (action == 3) { window.location = "multidesktop.aspx?mesh=" + meshid + "&auto=1"; }
-            p1updateInfo();
-        }
-
-        function hideContextMenu() {
-            QV('contextMenu', false);
-            QV('meshContextMenu', false);
-            contextelement = null;
-        }
-
-        //
-        // MY DEVICE
-        //
-
-        function refreshDevice(nodeid) {
-            if (!currentNode || currentNode._id != nodeid) return;
-            gotoDevice(nodeid, xxcurrentView, true);
-        }
-
-        function getNodeRights(nodeid) {
-            var node = getNodeFromId(nodeid);
-            var mesh = meshes[node.meshid];
-            return mesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
-        }
-
-        var currentNode;
-        var powerTimelineNode = null;
-        var powerTimelineReq = null;
-        var powerTimelineUpdate = null;
-        var powerTimeline = null;
-        function getCurrentNode() { return currentNode; };
-        function gotoDevice(nodeid, panel, refresh) {
-            var node = getNodeFromId(nodeid);
-            var mesh = meshes[node.meshid];
-            var meshrights = mesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
-            if (!currentNode || currentNode._id != node._id || refresh == true) {
-                currentNode = node;
-
-                // Add node name
-                var nname = EscapeHtml(node.name);
-                if ((meshrights & 4) != 0) { nname = '<span onclick=showEditNodeValueDialog(0) style=cursor:pointer>' + EscapeHtml(node.name) + '</span>'; }
-                QH('p10deviceName', nname);
-                QH('p11deviceName', nname);
-                QH('p12deviceName', nname);
-                QH('p13deviceName', nname);
-                QH('p14deviceName', nname);
-                QH('p15deviceName', nname);
-
-                // Node attributes
-                var x = '<table style=width:100%>';
-
-                // Attribute: Mesh
-                x += addDeviceAttribute('Mesh', '<a onclick=gotoMesh("' + node.meshid + '") style=cursor:pointer>' + EscapeHtml(meshes[node.meshid].name) + '</a>');
-
-                // Attribute: Host
-                if ((mesh.mtype == 1) || (node.name != node.host)) {
-                    if ((meshrights & 4) != 0) {
-                        if (node.host) {
-                            x += addDeviceAttribute('Hostname', '<span onclick=showEditNodeValueDialog(1) style=cursor:pointer>' + EscapeHtml(node.host) + '</span>');
-                        } else {
-                            x += addDeviceAttribute('Hostname', '<span onclick=showEditNodeValueDialog(1) style=cursor:pointer><i>None</i></span>');
-                        }
-                    } else {
-                        x += addDeviceAttribute('Hostname', EscapeHtml(node.host));
-                    }
-                }
-
-                // Attribute: Description
-                var description = node.desc?EscapeHtml(node.desc):"<i>None</i>";
-                if ((meshrights & 4) != 0) {
-                    x += addDeviceAttribute('Description', '<span onclick=showEditNodeValueDialog(2) style=cursor:pointer>' + description + '</span>');
-                } else {
-                    x += addDeviceAttribute('Description', description);
-                }
-
-                // Attribute: Mesh Agent
-                var agentsStr = ['Unknown', 'Windows 32bit console', 'Windows 64bit console', 'Windows 32bit service', 'Windows 64bit service', 'Linux 32bit', 'Linux 64bit', 'MIPS', 'XENx86', 'Android ARM', 'Linux ARM', 'OSX 32bit', 'Android x86', 'PogoPlug ARM', 'Android APK', 'Linux Poky x86-32bit', 'OSX 64bit', 'ChromeOS', 'Linux Poky x86-64bit', 'Linux NoKVM x86-32bit', 'Linux NoKVM x86-64bit', 'Windows MinCore console', 'Windows MinCore service', 'NodeJS' ];
-                if ((node.agent != undefined) && (node.agent.id != undefined) && (node.agent.ver != undefined)) {
-                    var str = '';
-                    if (node.agent.id <= agentsStr.length) { str = agentsStr[node.agent.id]; } else { str = agentsStr[0]; }
-                    str += ' v' + node.agent.ver;
-                    x += addDeviceAttribute('Mesh Agent', str);
-                }
-
-                // Attribute: Intel AMT
-                if (node.intelamt != undefined) {
-                    var str = '';
-                    if (node.intelamt.ver == undefined || node.intelamt.state == undefined) { str += '<i>Unknown Version & State</i>'; } else { str += ('v' + node.intelamt.ver); }
-                    if (node.intelamt.user == undefined || node.intelamt.user == '') {
-                        if ((meshrights & 4) != 0) {
-                            str += ', <i style=color:#FF0000;cursor:pointer title="Edit Intel&reg; AMT credentials" onclick=editDeviceAmtSettings("' + node._id + '")>No Credentials</i>';
-                        } else {
-                            str += ', <i style=color:#FF0000>No Credentials</i>';
-                        }
-                    }
-                    str += ' ';
-                    if ((meshrights & 4) != 0) {
-                        str += '<img src=images/link4.png height=10 width=10 title="Edit Intel&reg; AMT credentials" style=cursor:pointer onclick=editDeviceAmtSettings("' + node._id + '")>';
-                    }
-                    x += addDeviceAttribute('Intel&reg; AMT', str);
-                }
-
-                // Attribute: Intel AMT
-                //if (node.intelamt && node.intelamt.user) { x += addDeviceAttribute('Intel&reg; AMT', node.intelamt.user); }
-
-                // Attribute: Connectivity (Only show this if more than just the agent is connected).
-                var connectivity = node.conn;
-                if (connectivity && connectivity > 1) {
-                    var cstate = [];
-                    if ((node.conn & 1) != 0) cstate.push('<span title="Mesh agent is connected and ready for use.">Mesh Agent</span>');
-                    if ((node.conn & 2) != 0) cstate.push('<span title="Intel&reg; AMT CIRA is connected and ready for use.">Intel&reg; AMT CIRA</span>');
-                    if ((node.conn & 4) != 0) cstate.push('<span title="Intel&reg; AMT is routable and ready for use.">Intel&reg; AMT</span>');
-                    if ((node.conn & 8) != 0) cstate.push('<span title="Mesh agent is reachable using another agent as relay.">Mesh Relay</span>');
-                    x += addDeviceAttribute('Connectivity', cstate.join(', '));
-                }
-
-                x += '</table>';
-                QH('p10html', x);
-
-                // Show node last 7 days timeline
-                drawDeviceTimeline();
-
-                // Show bottom buttons
-                x = '<div style=float:right;font-size:x-small>';
-                if ((meshrights & 4) != 0) x += '<a style=cursor:pointer onclick=p10showDeleteNodeDialog("' + node._id + '")>Delete Device</a>';
-                x += '</div><div style=font-size:x-small>';
-                x += '</div><br>'
-
-                QH('p10html3', x);
-
-                // Set the node power state
-                powerstate = PowerStateStr(node.state);
-                //if (node.state == 0) { powerstate = 'Unknown State'; }
-                if (node.agct && ((connectivity & 1) != 0)) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title="Agent connected since ' + new Date(node.agct).toLocaleString() + '">Agent connected</span>'; }
-                if (node.cict && ((connectivity & 2) != 0)) { if (powerstate.length > 0) { powerstate += '<br/>'; } powerstate += '<span style=font-size:12px title="Intel&reg; AMT connected since ' + new Date(node.cict).toLocaleString() + '">Intel&reg; AMT connected</span>'; }
-                
-                QH('MainComputerState', powerstate);
-
-                // Set the node icon
-                Q('MainComputerImage').setAttribute("src", "images/icons200-" + node.icon + "-1.png");
-                Q('MainComputerImage').className = ((!node.conn) || (node.conn == 0)?'gray':'');
-
-                // Setup/Refresh the desktop tab
-                setupDesktop();
-                setupTerminal();
-                setupFiles();
-                var consoleRights = ((meshrights & 16) != 0);
-                if (consoleRights) { setupConsole(); } else { if (panel == 15) { panel = 10; } }
-
-                // Show or hide the tabs
-                // mesh.mtype: 1 = Intel AMT only, 2 = Mesh Agent
-                // node.agent.caps (bitmask): 1 = Desktop, 2 = Terminal, 4 = Files, 8 = Console
-                QV('MainDevDesktop', (mesh.mtype == 1) || (node.agent == undefined) || (node.agent.caps == undefined) || ((node.agent.caps & 1) != 0));
-                QV('MainDevTerminal', (mesh.mtype == 1) || (node.agent == undefined) || (node.agent.caps == undefined) || ((node.agent.caps & 2) != 0));
-                QV('MainDevFiles', (mesh.mtype == 2) && ((node.agent == undefined) || (node.agent.caps == undefined) || ((node.agent.caps & 4) != 0)));
-                QV('MainDevAmt', node.intelamt != undefined);
-                QV('MainDevConsole', consoleRights && (mesh.mtype == 2) && ((node.agent == undefined) || (node.agent.caps == undefined) || ((node.agent.caps & 8) != 0)));
-                QV('p15uploadCore', (node.agent != undefined) && (node.agent.caps != undefined) && ((node.agent.caps & 16) != 0));
-                QH('p15coreName', ((node.agent != undefined) && (node.agent.core != undefined))?node.agent.core:'');
-
-                // Setup/Refresh Intel AMT tab
-                var amtFrameNode = Q('p14iframe').contentWindow.getCurrentMeshNode();
-                if ((amtFrameNode != null) && (amtFrameNode._id != currentNode._id)) { Q('p14iframe').contentWindow.disconnect(); }
-
-                // Request the power timeline
-                if ((powerTimelineNode != currentNode._id) && (powerTimelineReq != currentNode._id)) { powerTimelineReq = currentNode._id; meshserver.Send({ action: 'powertimeline', nodeid: currentNode._id }); }
-            }
-            if (!panel) panel = 10;
-            go(panel);
-        }
-
-        // Look to see if we need to update the device timeline
-        function updateDeviceTimeline() {
-            if ((meshserver.State != 2) || (powerTimelineNode == null) || (powerTimelineUpdate == null) || (currentNode == null)) return;
-            if ((powerTimelineNode == powerTimelineReq) && (currentNode._id == powerTimelineNode) && (powerTimelineUpdate < Date.now())) { powerTimelineUpdate = null; meshserver.Send({ action: 'powertimeline', nodeid: currentNode._id }); }
-        }
-
-        // Draw device power bars. The bars are 766px wide.
-        function drawDeviceTimeline() {
-            var timeline = null, now = Date.now();
-            if (currentNode._id == powerTimelineNode) { timeline = powerTimeline; }
-
-            // Calculate when the timeline starts
-            var d = new Date();
-            d.setHours(0, 0, 0, 0);
-            d = new Date(d.getTime() - (1000 * 60 * 60 * 24 * 6));
-            var timelineStart = d.getTime();
-
-            // De-compact the timeline
-            var timeline2 = [];
-            if (timeline != null && timeline.length > 1) {
-                timeline2.push([ 0, timeline[1], timeline[0] ]); // Start, End, Power
-                var ct = timeline[1];
-                for (var i = 2; i < timeline.length; i += 2) {
-                    var power = timeline[i], dt = now;
-                    if (timeline.length > (i + 1)) { dt = timeline[i + 1]; }
-                    timeline2.push([ ct, ct + dt, power ]); // Start, End, Power
-                    ct = ct + dt;
-                }
-            }
-
-            // Draw the timeline
-            var x = '', count = 1, date = new Date();
-            date.setHours(0, 0, 0, 0);
-            for (var i = 0; i < 7; i++) {
-                var datavalue = '', start = date.getTime(), end = start + (1000 * 60 * 60 * 24);
-                for (var j in timeline2) {
-                    var block = timeline2[j];
-                    if (isTimeBlockInside(start, end, block[0], block[1]) == true) {
-                        var ts = Math.max(start, block[0]);
-                        var te = Math.min(Math.min(end, block[1]), now);
-                        var width = Math.round((te - ts) / 112794);
-                        if (width > 0) {
-                            var title = powerStateStrings2[block[2]] + ' from ' + new Date(ts).toLocaleTimeString() + ' to ' + new Date(te).toLocaleTimeString() + '.';
-                            datavalue += '<div title="' + title + '" style=display:table-cell;width:' + width + 'px;background-color:' + powerColor(block[2]) + ';height:16px></div>';
-                        }
-                    }
-                }
-                x += '<tr style=' + (((count % 2) == 0)?'background-color:#DDD':'') + '><td><div>&nbsp;' + date.toLocaleDateString() + '<div></div></div></td><td><div>' + datavalue + '</div></td></tr>';
-                ++count;
-                date = new Date(date.getTime() - (1000 * 60 * 60 * 24)); // Substract one day
-            }
-            QH('p10html2', '<table style="color:black;background-color:#EEE;border-color:#AAA;border-width:1px;border-style:solid;border-collapse:collapse" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col style=text-align:center;width:150px>Day</th><th scope=col style=text-align:center>7 Day Power State</th></tr>' + x + '</tbody></table>');
-        }
-
-        // Return a color for the given power state
-        function powerColor(x) { if (x < powerColorTable.length) { return powerColorTable[x]; } return 'yellow'; }
-
-        // Return true if the time block is visible within the start/end period
-        function isTimeBlockInside(start, end, blockStart, blockEnd) {
-            if ((blockStart < start) && (blockEnd > end)) return true; // Block is wider than timespan
-            if ((blockStart > start) && (blockStart < end)) return true;
-            if ((blockEnd > start) && (blockEnd < end)) return true;
-            return false;
-        }
-
-        function addDeviceAttribute(name, value) { return '<tr><td class=style7 style=width:180px>' + name + '</td><td class=style9 style=max-width:400px;overflow:hidden>' + value + '</td></tr>'; }
-
-        function editDeviceAmtSettings(nodeid, func) {
-            if (xxdialogMode) return;
-            var x = '', node = getNodeFromId(nodeid), buttons = 3, meshrights = getNodeRights(nodeid);
-            if ((meshrights & 4) == 0) return;
-            x += addHtmlValue('Username', '<input id=dp10username style=width:230px maxlength=32 autocomplete=nope placeholder="admin" onchange=validateDeviceAmtSettings() onkeyup=validateDeviceAmtSettings() />');
-            x += addHtmlValue('Password', '<input id=dp10password type=password style=width:230px autocomplete=nope maxlength=32 onchange=validateDeviceAmtSettings() onkeyup=validateDeviceAmtSettings() />');
-            x += addHtmlValue('Security', '<select id=dp10tls style=width:236px><option value=0>No TLS security</option><option value=1>TLS security required</option></select>');
-            if ((node.intelamt.user != undefined) && (node.intelamt.user != '')) { buttons = 7; }
-            setDialogMode(2, "Edit Intel&reg; AMT credentials", buttons, editDeviceAmtSettingsEx, x, { node: node, func: func });
-            if ((node.intelamt.user != undefined) && (node.intelamt.user != '')) { Q('dp10username').value = node.intelamt.user; } else { Q('dp10username').value = 'admin'; }
-            Q('dp10tls').value = node.intelamt.tls;
-            validateDeviceAmtSettings();
-        }
-
-        function validateDeviceAmtSettings() {
-            QE('idx_dlgOkButton', passwordcheck(Q('dp10password').value));
-        }
-
-        function editDeviceAmtSettingsEx(button, tag) {
-            if (button == 2) {
-                // Delete button pressed, remove credentials
-                meshserver.Send({ action: 'changedevice', nodeid: tag.node._id, intelamt: { user: '', pass: '' } });
-            } else {
-                // Change Intel AMT credentials
-                var amtuser = Q('dp10username').value;
-                if (amtuser == '') amtuser = 'admin';
-                var amtpass = Q('dp10password').value;
-                if (amtpass == '') amtuser = '';
-                meshserver.Send({ action: 'changedevice', nodeid: tag.node._id, intelamt: { user: amtuser, pass: amtpass, tls: Q('dp10tls').value } });
-                tag.node.intelamt.user = amtuser;
-                tag.node.intelamt.tls = Q('dp10tls').value;
-                if (tag.func) { setTimeout(tag.func, 300); }
-            }
-        }
-
-        function p10showDeleteNodeDialog(nodeid) {
-            if (xxdialogMode) return;
-            var x = "Are you sure you want to delete node \"" + EscapeHtml(currentNode.name) + "\"?<br /><br />";
-            x += "<input id=p10check type=checkbox onchange=p10validateDeleteNodeDialog() />Confirm";
-            setDialogMode(2, "Delete Node", 3, p10showDeleteNodeDialogEx, x, nodeid);
-            p10validateDeleteNodeDialog();
-        }
-
-        function p10validateDeleteNodeDialog() {
-            QE('idx_dlgOkButton', Q('p10check').checked);
-        }
-
-        function p10showDeleteNodeDialogEx(buttons, nodeid) {
-            meshserver.Send({ action: 'removedevice', nodeid: nodeid });
-        }
-
-        function p10showiconselector() {
-            if (xxdialogMode) return;
-            var mesh = meshes[currentNode.meshid];
-            var meshrights = mesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
-            if ((meshrights & 4) == 0) return;
-
-            var x = '<br><div style=display:inline-block;width:40px></div>';
-            x += '<div style=display:inline-block class=i1 onclick=p10setIcon(1)></div>';
-            x += '<div style=display:inline-block class=i2 onclick=p10setIcon(2)></div>';
-            x += '<div style=display:inline-block class=i3 onclick=p10setIcon(3)></div>';
-            x += '<div style=display:inline-block class=i4 onclick=p10setIcon(4)></div>';
-            x += '<div style=display:inline-block class=i5 onclick=p10setIcon(5)></div>';
-            x += '<div style=display:inline-block class=i6 onclick=p10setIcon(6)></div><br><br>';
-            setDialogMode(2, "Icon Selection", 0, null, x);
-            QV('id_dialogclose', true);
-        }
-
-        function p10setIcon(icon) {
-            setDialogMode(0);
-            meshserver.Send({ action: 'changedevice', nodeid: currentNode._id, icon: icon });
-        }
-
-        var showEditNodeValueDialog_modes = ['Device Name', 'Hostname', 'Description'];
-        var showEditNodeValueDialog_modes2 = ['name', 'host', 'desc'];
-        function showEditNodeValueDialog(mode) {
-            if (xxdialogMode) return;
-            var x = addHtmlValue(showEditNodeValueDialog_modes[mode], '<input id=dp10devicevalue style=width:230px maxlength=32 onchange=p10editdevicevalueValidate(' + mode + ') onkeyup=p10editdevicevalueValidate(' + mode + ') />');
-            setDialogMode(2, "Edit Device", 3, showEditNodeValueDialogEx, x, mode);
-            var v = currentNode[showEditNodeValueDialog_modes2[mode]];
-            if (v == undefined) v = '';
-            Q('dp10devicevalue').value = v;
-            p10editdevicevalueValidate();
-        }
-
-        function showEditNodeValueDialogEx(button, mode) {
-            var x = { action: 'changedevice', nodeid: currentNode._id };
-            x[showEditNodeValueDialog_modes2[mode]] = Q('dp10devicevalue').value;
-            meshserver.Send(x);
-        }
-
-        function p10editdevicevalueValidate(mode) {
-            QE('idx_dlgOkButton', (mode > 1) || (Q('dp10devicevalue').value.length > 0));
-        }
-
-        //
-        // DESKTOP
-        //
-
-        var desktopNode;
-        function setupDesktop() {
-            // Setup the remote desktop
-            if (desktopNode == currentNode) return;
-            desktopNode = currentNode;
-            if (desktop) { desktop.Stop(); delete desktop; }
-            desktop = CreateAmtRedirect(CreateAmtRemoteDesktop('Desk'));
-            desktop.onStateChanged = onDesktopStateChange;
-            QE('connectbutton1', true);
-            t = localStorage.getItem('desktopsettings');
-            if (t != null) { desktopsettings = JSON.parse(t); }
-            applyDesktopSettings();
-
-            if (!Q('Desk')['toBlob']) { // On some browsers like IE, we can't save screen shots. Hide the scheenshot/capture buttons.
-                QV('deskSaveBtn', false);
-            }
-        }
-
-        function connectDesktop(e) {
-            if (!desktop) return;
-            if (desktop.State == 0) {
-                if ((desktopNode.intelamt.user == undefined) || (desktopNode.intelamt.user == '')) { editDeviceAmtSettings(desktopNode._id, connectDesktop); return; }
-                desktop.m.bpp = (desktopsettings.encoding == 1 || desktopsettings.encoding == 3) ? 1 : 2;
-                desktop.m.useZRLE = (desktopsettings.encoding < 3);
-                desktop.m.showmouse = desktopsettings.showmouse;
-                desktop.m.onScreenSizeChange = deskAdjust;
-                desktop.Start(desktopNode._id, 16994, '*', '*', 0);
-            } else {
-                desktop.Stop();
-            }
-        }
-
-        function onDesktopStateChange(desktop, state) {
-            //console.log("onDesktopStateChange: " + state);
-            connectbutton1.value = (state == 0) ? 'Connect' : 'Disconnect';
-            Q('deskstatus').textContent = StatusStrs[state];
-            switch (state) {
-                case 0:
-                    // desktop.m.ResetScreen();
-                    break;
-                case 2:
-                    break;
-            }
-        }
-
-        function showDesktopSettings() {
-            setDialogMode(7, "Remote Desktop Settings", 3, showDesktopSettingsChanged);
-        }
-
-        function showDesktopSettingsChanged() {
-            desktopsettings.encoding = d7desktopmode.value;
-            desktopsettings.showfocus = d7showfocus.checked;
-            desktopsettings.showmouse = d7showcursor.checked;
-            desktopsettings.showcad = d7showcad.checked;
-            localStorage.setItem('desktopsettings', JSON.stringify(desktopsettings));
-            applyDesktopSettings();
-            if (desktopsettings.showfocus == false) { desktop.m.focusmode = 0; deskFocusBtn.value = 'All Focus'; }
-            if (desktop.State != 0) { desktop.Stop(); setTimeout(connectDesktop, 50); }
-        }
-
-        function applyDesktopSettings() {
-            d7desktopmode.value = desktopsettings.encoding;
-            d7showfocus.checked = desktopsettings.showfocus;
-            d7showcursor.checked = desktopsettings.showmouse;
-            d7showcad.checked = desktopsettings.showcad;
-            QV('deskFocusBtn', desktopsettings.showfocus);
-            QV('DeskCAD', desktopsettings.showcad);
-        }
-
-        var fullscreen = false;
-        function deskToggleFull() {
-            fullscreen = !fullscreen;
-            QV('mastheadx', !fullscreen);
-            QV('masthead', !fullscreen);
-            QV('topbar', !fullscreen);
-            QV('p11deviceNameHeader', !fullscreen);
-            QV('footer', !fullscreen);
-            QV('column_l_bottomgap', !fullscreen);
-            QV('idx_deskFullBtn2', fullscreen);
-            QV('deskFullBtn', !fullscreen);
-            if (fullscreen) {
-                QS('container').width = '100%';
-                QS('container')['border-right'] = '0';
-                QS('container')['border-left'] = '0';
-                QS('column_l').padding = '0';
-                QS('column_l').width = '100%';
-            } else {
-                QS('container').width = '960px';
-                QS('container')['border-right'] = '1px solid #b7b7b7';
-                QS('container')['border-left'] = '1px solid #b7b7b7';
-                QS('column_l').padding = '0 15px';
-                QS('column_l').width = '930px';
-            }
-            deskAdjust();
-        }
-
-        function deskToggleFocus() {
-            desktop.m.focusmode = (desktop.m.focusmode + 64) % 192;
-            Q('deskFocusBtn').value = ['All Focus', 'Small Focus', 'Large Focus'][desktop.m.focusmode / 64];
-        }
-
-        function deskAdjust() {
-            console.log('deskAdjust');
-            var x = (Math.max(document.documentElement.clientHeight, window.innerHeight || 0) - (Q('deskarea1').clientHeight + Q('deskarea2').clientHeight + Q('Desk').clientHeight + Q('deskarea4').clientHeight + 2)) / 2;
-            if (fullscreen) {
-                document.documentElement.style.overflow = 'hidden';
-                QS('deskarea3x').height = null;
-                if (x < 0) {
-                    var mh = (Math.max(document.documentElement.clientHeight, window.innerHeight || 0) - (Q('deskarea1').clientHeight + Q('deskarea2').clientHeight + Q('deskarea4').clientHeight));
-                    var mw = (desktop.m.width / desktop.m.height) * mh;
-                    QS('Desk')['max-height'] = mh + 'px';
-                    QS('Desk')['max-width'] = mw + 'px';
-                    x = 0;
-                } else {
-                    QS('Desk')['max-height'] = null;
-                    QS('Desk')['max-width'] = null;
-                }
-                QS('Desk')['margin-top'] = x + 'px';
-                QS('Desk')['margin-bottom'] = x + 'px';
-            } else {
-                document.documentElement.style.overflow = 'auto';
-                QS('deskarea3x').height = '400px';
-                QS('Desk')['max-height'] = null;
-                QS('Desk')['max-width'] = null;
-                QS('Desk')['margin-top'] = '0';
-                QS('Desk')['margin-bottom'] = '0';
-            }
-        }
-
-        // Send CTRL-ALT-DEL
-        function sendCAD() { desktop.m.sendcad(); }
-
-        // Save the desktop image to file
-        function deskSaveImage() {
-            if (xxdialogMode || desktop.State != 3) return;
-            var n = 'Desktop', d = new Date();
-            if (amtsysstate) { n += "-" + amtsysstate['AMT_GeneralSettings'].response['HostName']; }
-            n += '-' + d.getFullYear() + "-" + ("0" + (d.getMonth() + 1)).slice(-2) + "-" + ("0" + d.getDate()).slice(-2) + "-" + ("0" + d.getHours()).slice(-2) + "-" + ("0" + d.getMinutes()).slice(-2);
-            Q("Desk")['toBlob'](function (blob) { saveAs(blob, n + ".jpg"); });
-        }
-
-        // Send special keys
-        //function sendSpecialKey() { var k = Q('specialkeylist').value; desktop.m.sendkey(k, 1); desktop.m.sendkey(k, 0); }
-
-        function dmousedown(e) { if (!xxdialogMode) desktop.m.mousedown(e) }
-        function dmouseup(e) { if (!xxdialogMode) desktop.m.mouseup(e) }
-        function dmousemove(e) { if (!xxdialogMode) desktop.m.mousemove(e) }
-
-        function drotate(x) { desktop.m.setRotation(desktop.m.rotation + x); deskAdjust(); deskAdjust(); }
-
-        //
-        // TERMINAL
-        //
-
-        var terminalNode;
-        function setupTerminal() {
-            // Setup the terminal
-            var samenode = (terminalNode == currentNode);
-            terminalNode = currentNode;
-            var online = ((terminalNode.conn & 7) != 0)?true:false; // If Agent (1), CIRA (2) or AMT (3) connected, enable Terminal
-            QE('connectbutton2', online);
-            if (((samenode == false) || (online == false)) && terminal) { terminal.Stop(); delete terminal; terminal = undefined; }
-        }
-
-        function onTerminalStateChange(terminal, state) {
-            connectbutton2.value = (state == 0) ? 'Connect' : 'Disconnect';
-            Q('termstatus').textContent = StatusStrs[state];
-            switch (state) {
-                case 0:
-                    // Disconnected, clear the terminal
-                    terminal.m.TermResetScreen();
-                    terminal.m.TermDraw();
-                    break;
-                case 3:
-                    break;
-            }
-        }
-
-        function connectTerminal(e) {
-            if (!terminal) {
-                // Take a look at the mesh for this node
-                var mesh = meshes[terminalNode.meshid];
-                if ((mesh.mtype == 1) && (terminalNode.intelamt != undefined)) {
-                    // Setup the Intel AMT terminal
-                    if ((terminalNode.intelamt.user == undefined) || (terminalNode.intelamt.user == '')) { editDeviceAmtSettings(terminalNode._id, connectTerminal); return; }
-                    terminal = CreateAmtRedirect(CreateAmtRemoteTerminal('Term'));
-                    terminal.onStateChanged = onTerminalStateChange;
-                    terminal.Start(terminalNode._id, 16994, '*', '*', 0);
-                } else {
-                    // Setup a mesh agent terminal
-                    terminal = CreateAgentRedirect(meshserver, CreateAmtRemoteTerminal('Term'));
-                    terminal.onStateChanged = onTerminalStateChange;
-                    terminal.Start(terminalNode._id);
-                }
-            } else {
-                //QH('Term', '');
-                terminal.Stop();
-                delete terminal;
-                terminal = undefined;
-            }
-        }
-
-        var terminalEmulations = ['UTF8 Terminal', 'Extended ASCII', 'Intel ASCII'];
-        function termToggleType() {
-            if (!terminal) return;
-            terminal.m.terminalEmulation = (terminal.m.terminalEmulation + 1) % 3;
-            Q('id_ttypebutton').value = terminalEmulations[terminal.m.terminalEmulation];
-        }
-
-        var fxEmulations = ['Intel (F10 = ESC+[OM)', 'Alternate (F10 = ESC+0)', 'VT100+ (F10 = ESC+[OY)'];
-        function termToggleFx() {
-            if (!terminal) return;
-            terminal.m.fxEmulation = (terminal.m.fxEmulation + 1) % 3;
-            Q('id_tfxkeysbutton').value = fxEmulations[terminal.m.fxEmulation];
-        }
-
-        //
-        // FILES
-        //
-
-        var filesNode;
-        function setupFiles() {
-            // Setup the files tab
-            var samenode = (filesNode == currentNode);
-            filesNode = currentNode;
-            var online = ((filesNode.conn & 1) != 0)?true:false; // If Agent (1) connected, enable Terminal
-            QE('p13Connect', online);
-            if (((samenode == false) || (online == false)) && files) { files.Stop(); delete files; files = undefined; }
-        }
-
-        function onFilesStateChange(files, state) {
-            p13Connect.value = (state == 0) ? 'Connect' : 'Disconnect';
-            Q('p13Status').textContent = StatusStrs[state];
-            switch (state) {
-                case 0:
-                    // Disconnected, clear the files
-                    QH('p13files', '');
-                    p13filetree = null;
-                    p13filetreelocation = ['c:'];
-                    QH('p13currentpath', '');
-                    QE('p13FolderUp', false);
-                    p13setActions();
-                    break;
-                case 3:
-                    files.Send(JSON.stringify({ action: 'ls', reqid: 1, path: 'c:\\' }));
-                    break;
-            }
-        }
-
-        function CreateRemoteFiles(onFileUpdate) {
-            var obj = { protocol: 5 };
-            obj.onFileUpdate = onFileUpdate;
-            obj.xxStateChange = function(state) { }
-            obj.ProcessData = function(data) { obj.onFileUpdate(data); }
-            return obj;
-        }
-
-        function connectFiles(e) {
-            if (!files) {
-                // Setup a mesh agent files
-                files = CreateAgentRedirect(meshserver, CreateRemoteFiles(p13gotFiles));
-                files.onStateChanged = onFilesStateChange;
-                files.Start(filesNode._id);
-            } else {
-                //QH('Term', '');
-                files.Stop();
-                delete files;
-                files = undefined;
-            }
-        }
-
-        var p13filetree = null;
-        var p13filetreelocation = ['c:'];
-
-        function p13gotFiles(data) {
-            p13filetree = JSON.parse(data);
-            p13updateFiles();
-        }
-        
-        function p13updateFiles() {
-            var html1 = '', html2 = '', displayPath = '<a style=cursor:pointer onclick=p13folderup(0)>Root</a>', fullPath = 'Root';
-
-            // Save all existing checked boxes
-            var checkedBoxes = [], checkboxes = document.getElementsByName('fd');
-            for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { checkedBoxes.push(checkboxes[i].value) }; } // Save all existing checked boxes
-
-            // Work on parsing the file path
-            var oldlinkpath = p13filetreelocation.join('/');
-            p13filetree.path = p13filetree.path.replace(/\//g, "\\");
-            var x = p13filetree.path.split('\\');
-            p13filetreelocation = [];
-            for (var i in x) { if (x[i] != '') { p13filetreelocation.push(x[i]); } } // Remove empty spaces
-            for (var i in p13filetreelocation) { displayPath += ' / <a style=cursor:pointer onclick=p13folderup(' + (parseInt(i) + 1) + ')>' + p13filetreelocation[i] + '</a>' } // Setup the path we display
-            var newlinkpath = p13filetreelocation.join('/');
-
-            // Sort the files
-            var filetreexx = p13sort_files(p13filetree.dir);
-
-            // Display all files and folders at this location
-            for (var i in filetreexx) {
-                // Figure out the name and shortname
-                var f = filetreexx[i], name = f.n, shortname;
-                shortname = name;
-                if (name.length > 70) { shortname = '<span title="' + EscapeHtml(name) + '">' + EscapeHtml(name.substring(0, 70)) + "...</span>"; } else { shortname = EscapeHtml(name); }
-                name = EscapeHtml(name);
-
-                // Figure out the date
-                var fdatestr = '';
-                if (f.d != undefined) { var fdate = new Date(f.d), fdatestr = (fdate.getMonth() + 1) + "/" + (fdate.getDate()) + "/" + fdate.getFullYear() + " " + fdate.toLocaleTimeString() + "&nbsp;"; }
-
-                // Figure out the size
-                var fsize = '';
-                if (f.s != undefined) { fsize = getFileSizeStr(f.s); }
-
-                var h = '';
-                if (f.t < 3) {
-                    var right = '', title = '';
-                    h = "<div class=filelist file=999><input style=float:left name=fd class=fcb type=checkbox onchange=p13setActions() value='" + name + "'>&nbsp;<span style=float:right title=\"" + title + "\">" + right + "</span><span><div class=fileIcon" + f.t + "></div><a style=cursor:pointer onclick=p13folderset(\"" + encodeURIComponent(f.nx) + "\")>" + shortname + "</a></span></div>";
-                } else {
-                    var link = shortname;
-                    if (f.s > 0) { link = "<a target=_blank href=\"downloadfile.ashx?link=" + encodeURIComponent(filetreelinkpath + '/' + f.nx) + "\">" + shortname + "</a>"; }
-                    h = "<div class=filelist file=3><input style=float:left name=fd class=fcb type=checkbox onchange=p13setActions() value='" + f.nx + "'>&nbsp;<span class=fsize>" + fdatestr + "</span><span style=float:right>" + fsize + "</span><span><div class=fileIcon" + f.t + "></div>" + link + "</span></div>";
-                }
-
-                if (f.t < 3) { html1 += h; } else { html2 += h; }
-            }
-
-            // Display the files and path
-            QH('p13files', html1 + html2);
-            QH('p13currentpath', displayPath);
-            QE('p13FolderUp', p13filetreelocation.length != 0);
-
-            // Re-check all boxes if needed
-            if (oldlinkpath == newlinkpath) {
-                checkboxes = document.getElementsByName('fd');
-                for (var i = 0; i < checkboxes.length; i++) {
-                    checkboxes[i].checked = (checkedBoxes.indexOf(checkboxes[i].value) >= 0);
-                }
-            }
-
-            // Update the actions buttons
-            p13setActions();
-        }
-
-        function p13folderset(x) { files.Send(JSON.stringify({ action: 'ls', reqid: 1, path: p13filetree.path + '/' + p13filetree.dir[x].n })); }
-
-        function p13folderup(x) {
-            if (x == undefined) { p13filetreelocation.pop(); } else { while (p13filetreelocation.length > x) { p13filetreelocation.pop(); } }
-            files.Send(JSON.stringify({ action: 'ls', reqid: 1, path: p13filetreelocation.join('/') }));
-        }
-
-        var p13sortorder;
-        function p13sort_filename(a, b) { if (a.ln > b.ln) return (1 * p13sortorder); if (a.ln < b.ln) return (-1 * p13sortorder); return 0; }
-        function p13sort_timestamp(a, b) { if (a.d > b.d) return (1 * p13sortorder); if (a.d < b.d) return (-1 * p13sortorder); return 0; }
-        function p13sort_bysize(a, b) { if (a.s == b.s) return p13sort_filename(a, b); return (((a.s - b.s)) * p13sortorder); }
-
-        function p13sort_files(files) {
-            var r = [], sortselection = Q('p13sortdropdown').value;
-            for (var i in files) { files[i].nx = i; if (files[i].n == undefined) { files[i].n = i; } files[i].ln = files[i].n.toLowerCase(); r.push(files[i]); }
-            p13sortorder = 1;
-            if (sortselection > 3) { p13sortorder = -1; sortselection -= 3; }
-            if (sortselection == 1) { r.sort(p13sort_filename); }
-            else if (sortselection == 2) { r.sort(p13sort_bysize); }
-            else if (sortselection == 3) { r.sort(p13sort_timestamp); }
-            return r;
-        }
-
-        function p13setActions() {
-            if (p13filetree == null) {
-                QE('p13DeleteFileButton', false);
-                QE('p13NewFolderButton', false);
-                QE('p13UploadButton', false);
-                QE('p13RenameFileButton', false);
-                QE('p13SelectAllButton', false)
-                Q('p13SelectAllButton').value = 'Select All';
-            } else {
-                var cc = p13getFileSelCount(), tc = p13getFileCount();
-                QE('p13DeleteFileButton', (cc > 0) && (p13filetreelocation.length > 0));
-                QE('p13NewFolderButton', p13filetreelocation.length > 0);
-                QE('p13UploadButton', p13filetreelocation.length > 0);
-                QE('p13RenameFileButton', (cc == 1) && (p13filetreelocation.length > 0));
-                QE('p13SelectAllButton', tc > 0)
-                Q('p13SelectAllButton').value = (cc > 0 ? 'Select None' : 'Select All');
-            }
-        }
-
-        function p13getFileSelCount() { var cc = 0; var checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) cc++; } return cc; }
-        function p13getFileCount() { var cc = 0; var checkboxes = document.getElementsByName('fd'); return checkboxes.length; }
-        function p13selectallfile() { var nv = (p13getFileSelCount() == 0), checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { checkboxes[i].checked = nv; } p13setActions(); }
-        function p13createfolder() { setDialogMode(2, "New Folder", 3, p13createfolderEx, '<input type=text id=p13renameinput maxlength=64 onkeyup=p13fileNameCheck() style=width:100% />'); Q('p13renameinput').focus(); }
-        function p13createfolderEx() { meshserver.Send({ action: 'fileoperation', fileop: 'createfolder', path: filetreelocation, newfolder: Q('p13renameinput').value}); }
-        function p13deletefile() { var cc = getFileSelCount(); setDialogMode(2, "Delete", 3, p13deletefileEx, (cc > 1)?('Delete ' + cc + ' selected items?'):('Delete selected item?')); }
-        function p13deletefileEx() { var delfiles = [], checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { delfiles.push(checkboxes[i].value); } } meshserver.Send({ action: 'fileoperation', fileop: 'delete', path: filetreelocation, delfiles: delfiles}); }
-        function p13renamefile() { var renamefile, checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { renamefile = checkboxes[i].value; } } setDialogMode(2, "Rename", 3, p13renamefileEx, '<input type=text id=p13renameinput maxlength=64 onkeyup=p13fileNameCheck() style=width:100% value="' + renamefile + '" />', { action: 'fileoperation', fileop: 'rename', path: filetreelocation, oldname: renamefile}); Q('p13renameinput').focus(); }
-        function p13renamefileEx(b, t) { t.newname = Q('p13renameinput').value; meshserver.Send(t); }
-        function p13fileNameCheck() { QE('idx_dlgOkButton', isFilenameValid(Q('p13renameinput').value)); }
-        function p13uploadFile() { setDialogMode(2, "Upload File", 3, p13uploadFileEx, '<form method=post enctype=multipart/form-data action=uploadfile.ashx target=fileUploadFrame><input type=text name=link style=display:none id=p13uploadpath value=\"' + encodeURIComponent(filetreelinkpath) + '\" /><input type=file name=files id=p13uploadinput style=width:100% multiple=multiple onchange="updateUploadDialogOk(\'p13uploadinput\')" /><input type=submit id=p13loginSubmit style=display:none /></form>'); updateUploadDialogOk('p13uploadinput'); }
-        function p13uploadFileEx() { Q('p13loginSubmit').click(); }
-        function updateUploadDialogOk(x) { QE('idx_dlgOkButton', Q(x).value != ''); }
-
-        function p13fileDragDrop(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            QV('p13bigfail', false);
-            QV('p13bigok', false);
-            if (e.dataTransfer == null || e.dataTransfer.files.length == 0) return;
-            var names = [], sizes = [], types = [], datas = [], readercount = e.dataTransfer.files.length;
-            for (var i = 0; i < e.dataTransfer.files.length; i++) {
-                var reader = new FileReader(), file = e.dataTransfer.files[i];
-                names.push(file.name);
-                sizes.push(file.size);
-                types.push(file.type);
-                reader.onload = function(event) {
-                    datas.push(event.target.result);
-                    if (--readercount == 0) {
-                        Q('p13fileDragName').value = names.join('*');
-                        Q('p13fileDragSize').value = sizes.join('*');
-                        Q('p13fileDragType').value = types.join('*');
-                        Q('p13fileDragData').value = datas.join('*');
-                        Q('p13fileDragLink').value = encodeURIComponent(filetreelinkpath);
-                        Q('p13loginSubmit2').click();
-                    }
-                }
-                reader.readAsDataURL(file);
-            }
-        }
-
-        var p13dragtimer = null;
-        function p13fileDragOver(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            if (p13dragtimer != null) { clearTimeout(p13dragtimer); p13dragtimer = null; }
-            var ac = true; // TODO: Set to true if we can accept the file
-            QV('p13bigok', ac);
-            QV('p13bigfail', !ac);
-        }
-
-        function p13fileDragLeave(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            if (e.target.id != "p13filetable") {
-                QV('p13bigfail', false);
-                QV('p13bigok', false);
-            } else {
-                p13dragtimer = setTimeout("QV('p13bigfail',false);QV('p13bigok',false);p13dragtimer=null;", 200);
-            }
-        }
-
-        //
-        // MESH AGENT CONSOLE
-        //
-
-        var consoleNode;
-        function setupConsole() {
-            // Setup the console
-            var samenode = (consoleNode == currentNode);
-            consoleNode = currentNode;
-
-            var mesh = meshes[consoleNode.meshid];
-            var meshrights = mesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
-            if ((meshrights & 16) != 0) {
-                if (consoleNode.consoleText == undefined) { consoleNode.consoleText = ''; }
-                if (samenode == false) {
-                    QH('p15agentConsole', consoleNode.consoleText);
-                    Q('p15agentConsole').scrollTop = Q('p15agentConsole').scrollHeight;
-                }
-                var online = ((consoleNode.conn & 1) != 0)?true:false;
-                QH('p15statetext', online?"Mesh Agent is online":"Mesh Agent is offline");
-                QE('p15consoleText', online);
-                QE('p15uploadCore', online);
-            } else {
-                QH('p15statetext', 'Access Denied');
-                QE('p15consoleText', false); 
-                QE('p15uploadCore', false);
-            }
-
-            QV('p15uploadCore', (userinfo.siteadmin == 0xFFFFFFFF));
-        }
-
-        // Clear the console for this node
-        function p15consoleClear() {
-            QH('p15agentConsole', '');
-            consoleNode.consoleText = '';
-        }
-
-        // Send a command to to agent
-        var consoleHistory = [];
-        function p15consoleSend(e) {
-            if (e && e.keyCode != 13) return;
-            var v = Q('p15consoleText').value, t = '<div style=color:green>&gt; ' + EscapeHtml(Q('p15consoleText').value) + '<br/></div>';
-            Q('p15agentConsole').innerHTML += t;
-            consoleNode.consoleText += t;
-            Q('p15agentConsole').scrollTop = Q('p15agentConsole').scrollHeight;
-            Q('p15consoleText').value = '';
-            Q('p15consoleText').focus();
-
-            // Send the command to the mesh agent
-            meshserver.Send({ action: 'msg', type:'console', nodeid: consoleNode._id, value: v });
-
-            // Add comment to history list
-            if (v.length > 0) {
-                // Move this command to the top if it already exists
-                var j = consoleHistory.indexOf(v);
-                if (j >= 0) { consoleHistory.splice(j, 1); }
-                consoleHistory.unshift(v);
-                consoleHistory.splice(10);
-
-                // Clear the history from the drop down
-                var history = Q('p15history');
-                while (history.firstChild) { history.removeChild(history.firstChild); }
-
-                // Put the new history of commands into the dropdown
-                for (var i in consoleHistory) {
-                    var text = consoleHistory[i];
-                    var option = document.createElement("option");
-                    option.text = text;
-                    history.appendChild(option);
-                }
-            }
-        }
-
-        // Handle Mesh Agent console data
-        function p15consoleReceive(node, data) {
-            data = '<div>' + EscapeHtmlBreaks(data) + '</div>'
-            if (node.consoleText == undefined) { node.consoleText = data; } else { node.consoleText += data; }
-            if (consoleNode == node) {
-                Q('p15agentConsole').innerHTML += data;
-                Q('p15agentConsole').scrollTop = Q('p15agentConsole').scrollHeight;
-            }
-        }
-
-        // Called then user presses the "Change Core" button
-        function p15uploadCore() {
-            if (xxdialogMode) return;
-            var x = '<select id=d3coreMode style=float:right;width:260px><option value=1>Upload default server core</option><option value=2>Clear the core</option><option value=3>Upload a core file</option></select><div>Change Core</div>';
-            setDialogMode(2, "Change Mesh Agent Core", 3, p15uploadCoreEx, x);
-        }
-
-        function p15uploadCoreEx() {
-            if (Q('d3coreMode').value == 1) {
-                // Upload default core
-                meshserver.Send({ action: 'uploadagentcore', nodeid: consoleNode._id, path:'*' });
-            } else if (Q('d3coreMode').value == 2) {
-                // Clear the core
-                meshserver.Send({ action: 'uploadagentcore', nodeid: consoleNode._id });
-            } else if (Q('d3coreMode').value == 3) {
-                // Upload file as core
-                p15uploadCore2();
-            }
-        }
-
-        // Called then user opts to upload a file as core
-        function p15uploadCore2() {
-            if (xxdialogMode) return;
-            Q('d3localmodeform').action = 'uploadmeshcorefile.ashx';
-            Q('d3attrib').value = currentNode._id;
-            setDialogMode(3, "Upload Mesh Agent Core", 3, p15uploadCoreEx2);
-            d3init();
-        }
-
-        function p15uploadCoreEx2() {
-            var mode = Q('d3uploadMode').value;
-            if (mode == 1) {
-                // Upload local mesh agent core
-                Q('d3submit').click();
-            } else {
-                // Upload server mesh agent code
-                var files = d3getFileSel();
-                if (files.length == 1) { meshserver.Send({ action: 'uploadagentcore', nodeid: consoleNode._id, path: d3filetreelocation.join('/') + '/' + files[0] }); }
-            }
-        }
-
-        //
-        // MY ACCOUNT
-        //
-
-        function account_showDeleteAccount() {
-            if (xxdialogMode) return;
-            var x = "To delete this account, type in the account password in both boxes below and hit ok.<br /><br />";
-            x += "<form action='{{{domainurl}}}deleteaccount' method='post'><table style=margin-left:80px><tr>";
-            x += "<td align=right>Password:</td><td><input id=apassword1 type=password name=apassword1 autocomplete=off onchange=account_validateDeleteAccount() onkeyup=account_validateDeleteAccount() /></td>";
-            x += "</tr><tr>";
-            x += "<td align=right>Password:</td><td><input id=apassword2 type=password name=apassword2 autocomplete=off onchange=account_validateDeleteAccount() onkeyup=account_validateDeleteAccount() /></td>";
-            x += '</tr></table><br /><div style="padding:10px;margin-bottom:4px">';
-            x += '<input id="account_dlgCancelButton" type="button" value="Cancel" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">';
-            x += '<input id="account_dlgOkButton" type="submit" value="OK" style="float:right;width:80px" onclick="dialogclose(1)">';
-            x += '</div><br /></form>';
-            setDialogMode(2, "Delete Account", 0, null, x);
-            account_validateDeleteAccount();
-        }
-
-        function account_showChangePassword() {
-            if (xxdialogMode) return;
-            var x = "Change your account password by entering the new password twice in the boxes below.<br /><br />";
-            x += "<form action='{{{domainurl}}}changepassword' method='post'><table style=margin-left:60px><tr>";
-            x += "<td align=right>Password:</td><td><input id=apassword1 type=password name=apassword1 autocomplete=off onchange=account_validateNewPassword() onkeyup=account_validateNewPassword() /> <b><span id=dxPassWarn></span></b></td>";
-            x += "</tr><tr>";
-            x += "<td align=right>Password:</td><td><input id=apassword2 type=password name=apassword2 autocomplete=off onchange=account_validateNewPassword() onkeyup=account_validateNewPassword() /></td>";
-            x += '</tr></table><br /><div style="padding:10px;margin-bottom:4px">';
-            x += '<input id="account_dlgCancelButton" type="button" value="Cancel" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">';
-            x += '<input id="account_dlgOkButton" type="submit" value="OK" style="float:right;width:80px" onclick="dialogclose(1)">';
-            x += '</div><br /></form>';
-            setDialogMode(2, "Change Password", 0, null, x);
-            account_validateDeleteAccount();
-        }
-
-        function account_createMesh() {
-            if (xxdialogMode) return;
-            var x = "Create a new mesh computer group using the options below.<br /><br />";
-            x += addHtmlValue('Mesh Name', '<input id=dp2meshname style=width:230px maxlength=32 onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate() />');
-            x += addHtmlValue('Mesh Type', '<div style=width:230px;margin:0;padding:0><select id=dp2meshtype style=width:100% onchange=account_validateMeshCreate() ><option value=2>Mesh Agent Policy</option><option value=1>Intel&reg; AMT Agent-less Policy</option></select></div>');
-            x += addHtmlValue('Description', '<div style=width:230px;margin:0;padding:0><textarea id=dp2meshdesc maxlength=1024 style=width:100%;resize:none></textarea></div>');
-            setDialogMode(2, "Create Mesh", 3, account_createMeshEx, x);
-            account_validateMeshCreate();
-        }
-
-        function account_validateMeshCreate() {
-            QE('idx_dlgOkButton', Q('dp2meshname').value.length > 0);
-        }
-
-        function account_createMeshEx(button, tag) {
-            meshserver.Send({ action: 'createmesh', meshname: Q('dp2meshname').value, meshtype: Q('dp2meshtype').value, desc: Q('dp2meshdesc').value });
-        }
-
-        function account_validateDeleteAccount() {
-            QE('account_dlgOkButton', (Q('apassword1').value.length > 0) && (Q('apassword1').value == Q('apassword2').value));
-        }
-
-        function account_validateNewPassword() {
-            QE('account_dlgOkButton', (Q('apassword1').value.length > 0) && (Q('apassword1').value == Q('apassword2').value));
-            var r = '';
-            if (Q('apassword1').value != '') {
-                var passStrength = checkPasswordStrength(Q('apassword1').value);
-                if (passStrength >= 80) { r = '<span style=color:green>Strong<span>'; } else if (passStrength >= 60) { r = '<span style=color:blue>Good<span>'; } else { r = '<span style=color:red>Weak<span>'; }
-            }
-            QH('dxPassWarn', r);
-        }
-
-        // Return a password strength score
-        function checkPasswordStrength(password) {
-            var r = 0, letters = {}, varCount = 0, variations = { digits: /\d/.test(password), lower: /[a-z]/.test(password), upper: /[A-Z]/.test(password), nonWords: /\W/.test(password) }
-            if (!password) return 0;
-            for (var i = 0; i< password.length; i++) { letters[password[i]] = (letters[password[i]] || 0) + 1; r += 5.0 / letters[password[i]]; }
-            for (var c in variations) { varCount += (variations[c] == true) ? 1 : 0; }
-            return parseInt(r + (varCount - 1) * 10);
-        }
-
-        function updateMeshes() {
-            var r = '<table><tr>';
-            var c = 0, count = 0;
-            for (i in meshes) {
-                // Mesh positioning
-                if (c > 1) { r += '</tr><tr>'; c = 0; }
-                c++;
-                count++;
-
-                // Mesh
-                var rights = 'Administrator'; // TODO
-                r += '<td><div style=width:431px;height:50px;padding-top:1px;padding-bottom:1px;float:left><div style=float:left;width:30px;height:100%></div><div style=height:100%;cursor:pointer onclick=gotoMesh(\'' + i + '\')><div class=mi style=float:left;width:50px;height:50px></div><div style=height:100%><div class=g1></div><div class=e2 style=width:300px><div class=e1>' + EscapeHtml(meshes[i].name) + '</div><div>' + rights + '</div></div><div class=g2 style=float:left></div></div></div></div></td>';
-            }
-            r += '</tr></table>';
-
-            QH('p2meshes', r);
-            QV('p2noMeshFound', count == 0);
-        }
-
-        function gotoMesh(meshid) {
-            currentMesh = meshes[meshid];
-            p20updateMesh();
-            go(20);
-        }
-
-        function server_showRestoreDlg() {
-            if (xxdialogMode) return;
-            var x = 'Restore the server using a backup, <span style=color:red>this will delete the existing server data</span>. Only do this if you know what you are doing.<br /><br />';
-            x += '<form action="/restoreserver.ashx" enctype="multipart/form-data" method="post"><div>';
-            x += '<input id=account_dlgFileInput type=file name=datafile style=width:100% accept=".zip,application/octet-stream,application/zip,application/x-zip,application/x-zip-compressed" onchange=account_validateServerRestore()>';
-            x += '<input id=account_dlgCancelButton type=button value=Cancel style=float:right;width:80px;margin-left:5px onclick=dialogclose(0)>';
-            x += '<input id=account_dlgOkButton type=submit value=OK style=float:right;width:80px onclick=dialogclose(1)>';
-            x += '</div><br /><br /></form>';
-            setDialogMode(2, "Restore Server", 0, null, x);
-            account_validateServerRestore();
-        }
-
-        function account_validateServerRestore() {
-            QE('account_dlgOkButton', Q('account_dlgFileInput').files.length == 1);
-        }
-
-        //
-        // MY MESHS
-        //
-
-        var currentMesh;
-        function p20updateMesh() {
-            QH('p20meshName', EscapeHtml(currentMesh.name));
-            var meshtype = 'Unknown #' + currentMesh.mtype;
-            var meshrights = currentMesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
-            if (currentMesh.mtype == 1) meshtype = 'Intel&reg; AMT computer group (No Agent)';
-            if (currentMesh.mtype == 2) meshtype = 'Mesh agent computer group';
-
-            var x = '';
-            x += addHtmlValue('Name', addLinkConditional(EscapeHtml(currentMesh.name), 'p20editmesh()', (meshrights & 1) != 0));
-            x += addHtmlValue('Description', addLinkConditional(((currentMesh.desc && currentMesh.desc != '')?EscapeHtml(currentMesh.desc):'<i>None</i>'), 'p20editmesh()', (meshrights & 1) != 0));
-            x += addHtmlValue('Type', meshtype);
-            x += addHtmlValue('Identifier', currentMesh._id.split('/')[2]);
-
-            x += '<br>';
-            var currentMeshLinks = currentMesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()];
-            if (currentMeshLinks && ((currentMeshLinks.rights & 2) != 0)) { x += '<a onclick=p20showAddMeshUserDialog() style=cursor:pointer><img src=images/icon-addnew.png border=0 height=12 width=12> Add User</a>'; }
-            x += '<table style="color:black;background-color:#EEE;border-color:#AAA;border-width:1px;border-style:solid;border-collapse:collapse" border=0 cellpadding=2 cellspacing=0 width=100%><tbody><tr style=background-color:#AAAAAA;font-weight:bold><th scope=col style=text-align:left;width:430px>User Authorizations</th><th scope=col style=text-align:left></th></tr>';
-
-            var count = 1;
-            for (var i in currentMesh.links) {
-                var rights = 'Partial Rights', r = currentMesh.links[i].rights, xusername = i.split('/')[2];
-                if (r == 0xFFFFFFFF) rights = 'Full Administrator'; else if (r == 0) rights = 'No Rights';
-                var trash = '';
-                if ((i != userinfo._id) && (meshrights == 0xFFFFFFFF || (((meshrights & 2) != 0) && (rights != 0xFFFFFFFF)))) { trash = '<a onclick=p20deleteUser(event,"' + i + '") title="Remote user rights to this mesh" style=cursor:pointer><img src=images/trash.png border=0 height=10 width=10></a>'; }
-                x += '<tr onclick=p20viewuser("' + i + '") style=cursor:pointer' + (((count % 2) == 0)?';background-color:#DDD':'') + '><td><div title="Mesh User" class=m2></div><div>&nbsp;' + xusername + '<div></div></div></td><td><div style=float:right>' + trash + '</div><div>' + rights + '</div></td></tr>';
-                ++count;
-            }
-
-            x += '</tbody></table>';
-
-            // If we are full administrator on this mesh, allow deletion of the mesh
-            if (meshrights == 0xFFFFFFFF) { x += '<div style=font-size:x-small;text-align:right><span><a onclick=p20showDeleteMeshDialog() style=cursor:pointer>Delete Mesh</a></span></div>'; }
-
-            QH('p20info', x);
-        }
-
-        function p20showDeleteMeshDialog() {
-            if (xxdialogMode) return;
-            var x = "Are you sure you want to delete mesh \"" + EscapeHtml(currentMesh.name) + "\"? Deleting the mesh will also delete all information about computers within this mesh.<br /><br />";
-            x += "<input id=p20check type=checkbox onchange=p20validateDeleteMeshDialog() />Confirm";
-            setDialogMode(2, "Delete Mesh", 3, p20showDeleteMeshDialogEx, x);
-            p20validateDeleteMeshDialog();
-        }
-
-        function p20validateDeleteMeshDialog() {
-            QE('idx_dlgOkButton', Q('p20check').checked);
-        }
-
-        function p20showDeleteMeshDialogEx(buttons, tag) {
-            meshserver.Send({ action: 'deletemesh', meshid: currentMesh._id, meshname: currentMesh.name });
-        }
-
-        function p20editmesh() {
-            if (xxdialogMode) return;
-            x = "Create a new mesh computer group using the options below.<br /><br />";
-            x += addHtmlValue('Mesh Name', '<input id=dp20meshname style=width:230px maxlength=32 onchange=p20editmeshValidate() onkeyup=p20editmeshValidate() />');
-            x += addHtmlValue('Description', '<div style=width:230px;margin:0;padding:0><textarea id=dp20meshdesc maxlength=1024 style=width:100%;resize:none></textarea></div>');
-            setDialogMode(2, "Edit Mesh", 3, p20editmeshEx, x);
-            Q('dp20meshname').value = currentMesh.name;
-            if (currentMesh.desc) Q('dp20meshdesc').value = currentMesh.desc;
-            p20editmeshValidate();
-        }
-
-        function p20editmeshEx() {
-            meshserver.Send({ action: 'editmesh', meshid: currentMesh._id, meshname: Q('dp20meshname').value, desc: Q('dp20meshdesc').value });
-        }
-
-        function p20editmeshValidate() {
-            QE('idx_dlgOkButton', Q('dp20meshname').value.length > 0);
-        }
-
-        function p20showAddMeshUserDialog() {
-            if (xxdialogMode) return;
-            x = "Allow a user to manage the mesh and computers on this mesh<br /><br />";
-            x += addHtmlValue('User Name', '<input id=dp20username style=width:230px maxlength=32 onchange=p20validateAddMeshUserDialog() onkeyup=p20validateAddMeshUserDialog() />');
-            x += '<br><div>';
-            x += '<input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20fulladmin>Full Administrator<br>';
-            x += '<input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20editmesh>Edit Mesh<br>';
-            x += '<input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20manageusers>Manage Mesh Users<br>';
-            x += '<input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20managecomputers>Manage Mesh Computers<br>';
-            x += '<input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20remotecontrol>Remote Control<br>';
-            x += '<input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20meshagentconsole>Mesh Agent Console<br>';
-            x += '<input type=checkbox onchange=p20validateAddMeshUserDialog() id=p20meshserverfiles>Server Files<br>';
-            x += '</div>';
-            setDialogMode(2, "Add User to Mesh", 3, p20showAddMeshUserDialogEx, x);
-            p20validateAddMeshUserDialog();
-        }
-
-        function p20validateAddMeshUserDialog() {
-            var meshrights = currentMesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
-            QE('idx_dlgOkButton', (Q('dp20username').value.length > 0));
-            QE('p20fulladmin', meshrights == 0xFFFFFFFF);
-            QE('p20editmesh', (!Q('p20fulladmin').checked) && (meshrights == 0xFFFFFFFF));
-            QE('p20manageusers', !Q('p20fulladmin').checked);
-            QE('p20managecomputers', !Q('p20fulladmin').checked);
-            QE('p20remotecontrol', !Q('p20fulladmin').checked);
-            QE('p20meshagentconsole', !Q('p20fulladmin').checked);
-            QE('p20meshserverfiles', !Q('p20fulladmin').checked);
-        }
-
-        function p20showAddMeshUserDialogEx() {
-            var meshadmin = 0;
-            if (Q('p20fulladmin').checked == true) { meshadmin = 0xFFFFFFFF; } else {
-                if (Q('p20editmesh').checked == true) meshadmin += 1;
-                if (Q('p20manageusers').checked == true) meshadmin += 2;
-                if (Q('p20managecomputers').checked == true) meshadmin += 4;
-                if (Q('p20remotecontrol').checked == true) meshadmin += 8;
-                if (Q('p20meshagentconsole').checked == true) meshadmin += 16;
-                if (Q('p20meshserverfiles').checked == true) meshadmin += 32;
-            }
-            meshserver.Send({ action: 'addmeshuser', meshid: currentMesh._id, meshname: currentMesh.name, username: Q('dp20username').value , meshadmin: meshadmin});
-        }
-
-        function p20viewuser(userid) {
-            if (xxdialogMode) return;
-            var cmeshrights = currentMesh.links['user/{{{domain}}}/' + userinfo.name.toLowerCase()].rights;
-            var meshrights = currentMesh.links[userid].rights;
-            var r = '';
-            if (meshrights == 0xFFFFFFFF) r = ', Full Administrator (all rights)'; else {
-                if ((meshrights &  1) != 0) r += ', Edit Mesh';
-                if ((meshrights &  2) != 0) r += ', Manage Mesh Users';
-                if ((meshrights &  4) != 0) r += ', Manage Mesh Computers';
-                if ((meshrights &  8) != 0) r += ', Remote Control';
-                if ((meshrights & 16) != 0) r += ', Agent Console';
-                if ((meshrights & 32) != 0) r += ', Server Files';
-            }
-            r = r.substring(2);
-            var x = addHtmlValue('User Name', userid.split('/')[2]);
-            x += addHtmlValue('Permissions', r);
-            var buttons = 1;
-            if ((('user/{{{domain}}}/' + userinfo.name.toLowerCase()) != userid) && (cmeshrights == 0xFFFFFFFF || (((cmeshrights & 2) != 0) && (meshrights != 0xFFFFFFFF)))) buttons += 4;
-            setDialogMode(2, "Mesh User", buttons, p20viewuserEx, x, userid);
-        }
-
-        function p20viewuserEx(button, userid) {
-            if (button != 2) return;
-            setDialogMode(2, "Remote Mesh User", 3, p20viewuserEx2, "Confirm removal of user " + userid.split('/')[2] + "?", userid);
-        }
-
-        function p20deleteUser(e, userid) {
-            haltEvent(e);
-            p20viewuserEx(2, userid);
-        }
-
-        function p20viewuserEx2(button, userid) {
-            meshserver.Send({ action: 'removemeshuser', meshid: currentMesh._id, meshname: currentMesh.name, userid: userid});
-        }
-
-        //
-        // MY FILES
-        //
-
-        var filetreelinkpath;
-        var filetreelocation = [];
-
-        function updateFiles() {
-            var html1 = '', html2 = '', displayPath = '<a style=cursor:pointer onclick=p5folderup(0)>Root</a>', fullPath = 'Root', publicPath, filetreex = filetree, folderdepth = 1;
-
-            // Navigate to path location, build the paths at the same time
-            var filetreelocation2 = [], oldlinkpath = filetreelinkpath, checkedBoxes = [], checkboxes = document.getElementsByName('fc');
-            for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { checkedBoxes.push(checkboxes[i].value) }; } // Save all existing checked boxes
-
-            filetreelinkpath = '';
-            for (var i in filetreelocation) {
-                if ((filetreex.f != undefined) && (filetreex.f[filetreelocation[i]] != undefined)) {
-                    filetreelocation2.push(filetreelocation[i]);
-                    fullPath += ' / ' + filetreelocation[i];
-                    if ((folderdepth == 1)) {
-                        var sp = filetreelocation[i].split('/');
-                        publicPath = window.location + sp[0] + 'files/' + sp[2];
-                        //if (filetreelocation[i] === userinfo._id) { filetreelinkpath += 'self'; } else { filetreelinkpath += (sp[0] + '/' + sp[2]); }
-                        filetreelinkpath += filetreelocation[i];
-                    } else {
-                        if (filetreelinkpath != '') { filetreelinkpath += '/' + filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + filetreelocation[i]; } }
-                    }
-                    filetreex = filetreex.f[filetreelocation[i]];
-                    displayPath += ' / <a style=cursor:pointer onclick=p5folderup(' + folderdepth + ')>' + (filetreex.n != undefined?filetreex.n:filetreelocation[i]) + '</a>';
-                    folderdepth++;
-                } else {
-                    break;
-                }
-            }
-            filetreelocation = filetreelocation2; // In case we could not go down the full path, we set the new path location here.
-            var publicfolder = fullPath.toLowerCase().startsWith("root / " + userinfo._id + " / public");
-
-            // Sort the files
-            var filetreexx = p5sort_files(filetreex.f);
-
-            // Display all files and folders at this location
-            for (var i in filetreexx) {
-                // Figure out the name and shortname
-                var f = filetreexx[i], name = f.n, shortname;
-                shortname = name;
-                if (name.length > 70) { shortname = '<span title="' + EscapeHtml(name) + '">' + EscapeHtml(name.substring(0, 70)) + "...</span>"; } else { shortname = EscapeHtml(name); }
-                name = EscapeHtml(name);
-
-                // Figure out the date
-                var fdatestr = '';
-                if (f.d != undefined) { var fdate = new Date(f.d), fdatestr = (fdate.getMonth() + 1) + "/" + (fdate.getDate()) + "/" + fdate.getFullYear() + " " + fdate.toLocaleTimeString() + "&nbsp;"; }
-
-                // Figure out the size
-                var fsize = '';
-                if (f.s != undefined) { fsize = getFileSizeStr(f.s); }
-
-                var h = '';
-                if (f.t < 3) {
-                    var right = (f.t == 1)?p5getQuotabar(f):'', title = '';
-                    h = "<div class=filelist file=999><input style=float:left name=fc class=fcb type=checkbox onchange=p5setActions() value='" + name + "'>&nbsp;<span style=float:right title=\"" + title + "\">" + right + "</span><span><div class=fileIcon" + f.t + "></div><a style=cursor:pointer onclick=p5folderset(\"" + encodeURIComponent(f.nx) + "\")>" + shortname + "</a></span></div>";
-                } else {
-                    var link = shortname;
-                    var publiclink = '';
-                    if (publicfolder) { publiclink = ' (<a style=cursor:pointer title=\"Display public link\" onclick=\'p5showPublicLink(\"' + publicPath + '/' + f.nx + '\")\'>Link</a>)'; }
-                    if (f.s > 0) { link = "<a target=_blank href=\"downloadfile.ashx?link=" + encodeURIComponent(filetreelinkpath + '/' + f.nx) + "\">" + shortname + "</a>" + publiclink; }
-                    h = "<div class=filelist file=3><input style=float:left name=fc class=fcb type=checkbox onchange=p5setActions() value='" + f.nx + "'>&nbsp;<span class=fsize>" + fdatestr + "</span><span style=float:right>" + fsize + "</span><span><div class=fileIcon" + f.t + "></div>" + link + "</span></div>";
-                }
-
-                if (f.t < 3) { html1 += h; } else { html2 += h; }
-            }
-
-            //if (f.parent == undefined) {  }
-            QH('p5rightOfButtons', p5getQuotabar(filetreex));
-
-            QH('p5files', html1 + html2);
-            QH('p5currentpath', displayPath);
-            QE('p5FolderUp', filetreelocation.length != 0);
-            QV('p5PublicShare', publicfolder);
-
-            // Re-check all boxes if needed
-            if (oldlinkpath == filetreelinkpath) {
-                checkboxes = document.getElementsByName('fc');
-                for (var i = 0; i < checkboxes.length; i++) {
-                    checkboxes[i].checked = (checkedBoxes.indexOf(checkboxes[i].value) >= 0);
-                }
-            }
-
-            p5setActions();
-        }
-
-        function p5getQuotabar(f) {
-            while (f.t > 1) { f = f.parent; }
-            if ((f.t != 1) || (f.maxbytes == undefined)) return '';
-            var tf = Math.floor(f.s / 1024), tq = Math.floor((f.maxbytes - f.s) / 1024);
-            return '<span title="' + tf + "k in " + f.c + " file" + (f.c > 1?'s':'') + ". " + (Math.floor(f.maxbytes / 1024)) + 'k maxinum">' + ((tq < 0)?('Storage limit exceed'):(tq + 'k remaining')) + ' <progress style=height:10px;width:200px value=' + f.s + ' max=' + f.maxbytes + ' /></span>';
-        }
-
-        function p5showPublicLink(u) { setDialogMode(2, "Public Link", 1, null, '<input type=text style=width:100% value="' + u + '" readonly />'); }
-
-        var sortorder;
-        function p5sort_filename(a, b) { if (a.ln > b.ln) return (1 * sortorder); if (a.ln < b.ln) return (-1 * sortorder); return 0; }
-        function p5sort_timestamp(a, b) { if (a.d > b.d) return (1 * sortorder); if (a.d < b.d) return (-1 * sortorder); return 0; }
-        function p5sort_bysize(a, b) { if (a.s == b.s) return p5sort_filename(a, b); return (((a.s - b.s)) * sortorder); }
-
-        function p5sort_files(files) {
-            var r = [], sortselection = Q('p5sortdropdown').value;
-            for (var i in files) { files[i].nx = i; if (files[i].n == undefined) { files[i].n = i; } files[i].ln = files[i].n.toLowerCase(); r.push(files[i]); }
-            sortorder = 1;
-            if (sortselection > 3) { sortorder = -1; sortselection -= 3; }
-            if (sortselection == 1) { r.sort(p5sort_filename); }
-            else if (sortselection == 2) { r.sort(p5sort_bysize); }
-            else if (sortselection == 3) { r.sort(p5sort_timestamp); }
-            return r;
-        }
-
-        function p5setActions() {
-            var cc = getFileSelCount(), tc = getFileCount();
-            QE('p5DeleteFileButton', (cc > 0) && (filetreelocation.length > 0));
-            QE('p5NewFolderButton', filetreelocation.length > 0);
-            QE('p5UploadButton', filetreelocation.length > 0);
-            QE('p5RenameFileButton', (cc == 1) && (filetreelocation.length > 0));
-            QE('p5SelectAllButton', tc > 0)
-            Q('p5SelectAllButton').value = (cc > 0 ? 'Select None' : 'Select All');
-        }
-
-        function getFileSelCount() { var cc = 0; var checkboxes = document.getElementsByName('fc'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) cc++; } return cc; }
-        function getFileCount() { var cc = 0; var checkboxes = document.getElementsByName('fc'); return checkboxes.length; }
-        function p5selectallfile() { var nv = (getFileSelCount() == 0), checkboxes = document.getElementsByName('fc'); for (var i = 0; i < checkboxes.length; i++) { checkboxes[i].checked = nv; } p5setActions(); }
-        function setupBackPointers(x) { if (x.f != undefined) { var fs = 0, fc = 0; for (var i in x.f) { setupBackPointers(x.f[i]); x.f[i].parent = x; if (x.f[i].s) { fs += x.f[i].s; } if (x.f[i].c) { fc += x.f[i].c; } if (x.f[i].t == 3) { fc++; } } x.s = fs; x.c = fc; } return x; }
-        function getFileSizeStr(size) { if (size == 1) return "1 byte"; return "" + size + " bytes"; }
-        function p5folderup(x) { if (x == undefined) { filetreelocation.pop(); } else { while (filetreelocation.length > x) { filetreelocation.pop(); } } updateFiles(); }
-        function p5folderset(x) { filetreelocation.push(decodeURIComponent(x)); updateFiles(); }
-        function p5createfolder() { setDialogMode(2, "New Folder", 3, p5createfolderEx, '<input type=text id=p5renameinput maxlength=64 onkeyup=p5fileNameCheck() style=width:100% />'); Q('p5renameinput').focus(); }
-        function p5createfolderEx() { meshserver.Send({ action: 'fileoperation', fileop: 'createfolder', path: filetreelocation, newfolder: Q('p5renameinput').value}); }
-        function p5deletefile() { var cc = getFileSelCount(); setDialogMode(2, "Delete", 3, p5deletefileEx, (cc > 1)?('Delete ' + cc + ' selected items?'):('Delete selected item?')); }
-        function p5deletefileEx() { var delfiles = [], checkboxes = document.getElementsByName('fc'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { delfiles.push(checkboxes[i].value); } } meshserver.Send({ action: 'fileoperation', fileop: 'delete', path: filetreelocation, delfiles: delfiles}); }
-        function p5renamefile() { var renamefile, checkboxes = document.getElementsByName('fc'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { renamefile = checkboxes[i].value; } } setDialogMode(2, "Rename", 3, p5renamefileEx, '<input type=text id=p5renameinput maxlength=64 onkeyup=p5fileNameCheck() style=width:100% value="' + renamefile + '" />', { action: 'fileoperation', fileop: 'rename', path: filetreelocation, oldname: renamefile}); Q('p5renameinput').focus(); }
-        function p5renamefileEx(b, t) { t.newname = Q('p5renameinput').value; meshserver.Send(t); }
-        function p5fileNameCheck() { QE('idx_dlgOkButton', isFilenameValid(Q('p5renameinput').value)); }
-        var isFilenameValid = (function(){ var x1=/^[^\\/:\*\?"<>\|]+$/, x2=/^\./, x3=/^(nul|prn|con|lpt[0-9]|com[0-9])(\.|$)/i; return function isFilenameValid(fname){ return x1.test(fname)&&!x2.test(fname)&&!x3.test(fname)&&(fname[0] != '.'); } })();
-        function p5uploadFile() { setDialogMode(2, "Upload File", 3, p5uploadFileEx, '<form method=post enctype=multipart/form-data action=uploadfile.ashx target=fileUploadFrame><input type=text name=link style=display:none id=p5uploadpath value=\"' + encodeURIComponent(filetreelinkpath) + '\" /><input type=file name=files id=p5uploadinput style=width:100% multiple=multiple onchange="updateUploadDialogOk(\'p5uploadinput\')" /><input type=submit id=p5loginSubmit style=display:none /></form>'); updateUploadDialogOk('p5uploadinput'); }
-        function p5uploadFileEx() { Q('p5loginSubmit').click(); }
-        function updateUploadDialogOk(x) { QE('idx_dlgOkButton', Q(x).value != ''); }
-
-        function p5fileDragDrop(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            QV('bigfail', false);
-            QV('bigok', false);
-            if (e.dataTransfer == null || e.dataTransfer.files.length == 0) return;
-            var names = [], sizes = [], types = [], datas = [], readercount = e.dataTransfer.files.length;
-            for (var i = 0; i < e.dataTransfer.files.length; i++) {
-                var reader = new FileReader(), file = e.dataTransfer.files[i];
-                names.push(file.name);
-                sizes.push(file.size);
-                types.push(file.type);
-                reader.onload = function(event) {
-                    datas.push(event.target.result);
-                    if (--readercount == 0) {
-                        Q('p5fileDragName').value = names.join('*');
-                        Q('p5fileDragSize').value = sizes.join('*');
-                        Q('p5fileDragType').value = types.join('*');
-                        Q('p5fileDragData').value = datas.join('*');
-                        Q('p5fileDragLink').value = encodeURIComponent(filetreelinkpath);
-                        Q('p5loginSubmit2').click();
-                    }
-                }
-                reader.readAsDataURL(file);
-            }
-        }
-
-        var p5dragtimer = null;
-        function p5fileDragOver(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            if (p5dragtimer != null) { clearTimeout(p5dragtimer); p5dragtimer = null; }
-            var ac = true; // TODO: Set to true if we can accept the file
-            QV('bigok', ac);
-            QV('bigfail', !ac);
-        }
-
-        function p5fileDragLeave(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            if (e.target.id != "p5filetable") {
-                QV('bigfail', false);
-                QV('bigok', false);
-            } else {
-                p5dragtimer = setTimeout("QV('bigfail',false);QV('bigok',false);p5dragtimer=null;", 200);
-            }
-        }
-
-        //
-        // MY EVENTS
-        //
-
-        function events_update() {
-            var x = '', dateHeader = null;
-            for (var i in events) {
-                var event = events[i];
-                var time = new Date(event.time);
-                if (time.toLocaleDateString() != dateHeader) {
-                    if (dateHeader != null) x += '</table>';
-                    x += '<table style=width:100% cellpadding=0 cellspacing=0><tr><td class=DevSt>' + time.toLocaleDateString() + '</td></tr>';
-                    dateHeader = time.toLocaleDateString();
-                }
-                var icon = 'si3';
-                if (event.etype == 'user') icon = 'm2';
-                if (event.etype == 'server') icon = 'si3';
-
-                var msg = event.msg.split('(R)').join('&reg;');
-                if (event.username && event.username != userinfo.name) { msg += ': ' + event.username; }
-                x += '<tr><td><div class=' + icon + ' style=float:left;width:16px;margin-top:2px;margin-left:2px;height:16px></div><div class=g1 style=height:18px></div><div class=bar18 style=height:18px;width:140px;font-size:14px>' + time.toLocaleTimeString() + '</div><div class=bar18 style=height:18px;width:724px;font-size:14px>' + msg + '</div><div class=g2 style=height:18px;float:left></div><div class=bar182 style=float:none></div></td></tr>';
-            }
-            if (dateHeader != null) x += '</table>';
-            if (x == '') x = "<br><i>No Events Found</i><br><br>";
-            QH('p3events', x);
-        }
-
-        function showDeleteAllEventsDialog() {
-            if (xxdialogMode) return;
-            var x = "Delete all events in the server event log?<br /><br />";
-            x += "<input id=p3check type=checkbox onchange=validateDeleteAllEventsDialog() />Confirm";
-            setDialogMode(2, "Delete All Events", 3, showDeleteAllEventsDialogEx, x);
-            validateDeleteAllEventsDialog();
-        }
-
-        function validateDeleteAllEventsDialog() {
-            QE('idx_dlgOkButton', Q('p3check').checked);
-        }
-
-        function showDeleteAllEventsDialogEx(buttons, tag) {
-            meshserver.Send({ action: 'clearevents' });
-        }
-
-
-        //
-        // MY USERS
-        //
-
-        function updateUsers() {
-            QV('MainMenuMyUsers', users != null);
-            if (users == null) { QH('p3users', ''); return; }
-            var x = '<table style=width:100% cellpadding=0 cellspacing=0>';
-            for (var i in users) {
-                var user = users[i], icon = 'm2', msg = '';
-                if (wssessions != null && wssessions[user._id]) {
-                    var sessions = wssessions[user._id];
-                    if (sessions == 1) { msg = '1 active session'; } else { msg = sessions + ' active sessions'; }
-                }
-                if (msg != '') msg += ', ';
-                if (user.name != userinfo.name) { msg += "<a onclick=showUserAdminDialog(event,\"" + user._id + "\")>"; }
-                if ((user.siteadmin == undefined) || (user.siteadmin == 0)) {
-                    msg += "User";
-                } else if (user.siteadmin == 8) {
-                    msg += "User with server files";
-                } else if (user.siteadmin == 0xFFFFFFFF) {
-                    msg += "Full Admin";
-                } else {
-                    msg += "Partial Admin";
-                }
-                if ((user.quota != undefined) && ((user.siteadmin & 8) != 0)) { msg += ", " + (user.quota / 1024) + " k"; }
-                if (user.name != userinfo.name) { msg += "</a>"; }
-                msg = '<table style="width:100%"><tr><td>' + EscapeHtml(user.name) + ', <a onclick=doemail(event,\"' + user.email + '\")>' + user.email + '</a><td align=right>' + msg + '</table>';
-                x += '<tr><td style=cursor:pointer onclick=showUserInfoDialog(\"' + user._id + '\")><div class=' + icon + ' style=float:left;width:16px;margin-top:4px;margin-left:2px;height:16px></div><div class=g1 style=height:24px></div><div class=bar style=height:24px;width:864px;font-size:medium>' + msg + '</div><div class=g2 style=height:24px;float:left></div><div class=bar2 style=float:none></div></td></tr>';
-            }
-            x += '</table>';
-            QH('p3users', x);
-        }
-
-        function doemail(e, addr) {
-            if (xxdialogMode) return;
-            haltEvent(e);
-            window.open("mailto:" + addr);
-            return false;
-        }
-
-        function showUserInfoDialog(userid) {
-            var user = users[userid], x = '';
-            if (xxdialogMode) return;
-            x += addHtmlValue('Name', EscapeHtml(user.name));
-            x += addHtmlValue('Email', EscapeHtml(user.email));
-            x += addHtmlValue('Creation', new Date(user.creation).toLocaleString());
-            if (user.login) x += addHtmlValue('Last Login', new Date(user.login).toLocaleString());
-            if (user.quota) x += addHtmlValue('Server Quota', EscapeHtml(parseInt(user.quota) / 1024) + ' k');
-            var deletePossible = true;
-            if (user._id == userinfo._id) deletePossible = false;
-            if (user.siteadmin && user.siteadmin > 0 && userinfo.siteadmin != 0xFFFFFFFF) deletePossible = false;
-            setDialogMode(2, "User " + EscapeHtml(user.name), deletePossible?5:1, showUserInfoDialogDelete, x, user);
-        }
-
-        function showUserInfoDialogDelete(button, user) {
-            if (button == 2) { meshserver.Send({ action: 'deleteuser', userid: user._id, username: user.name }); }
-        }
-
-        function showCreateNewAccountDialog() {
-            if (xxdialogMode) return;
-            var x = '';
-            x += addHtmlValue('Name', '<input id=p4name style=width:230px maxlength=32 onchange=showCreateNewAccountDialogValidate() onkeyup=showCreateNewAccountDialogValidate() />');
-            x += addHtmlValue('Email', '<input id=p4email style=width:230px maxlength=64 onchange=showCreateNewAccountDialogValidate() onkeyup=showCreateNewAccountDialogValidate() />');
-            x += addHtmlValue('Password', '<input id=p4pass1 type=password style=width:230px maxlength=64 onchange=showCreateNewAccountDialogValidate() onkeyup=showCreateNewAccountDialogValidate() />');
-            x += addHtmlValue('Password', '<input id=p4pass2 type=password style=width:230px maxlength=64 onchange=showCreateNewAccountDialogValidate() onkeyup=showCreateNewAccountDialogValidate() />');
-            setDialogMode(2, "Create Account", 3, showCreateNewAccountDialogEx, x);
-            showCreateNewAccountDialogValidate();
-        }
-
-        function showCreateNewAccountDialogValidate() {
-            QE('idx_dlgOkButton', Q('p4name').value.length > 0 && Q('p4pass1').value.length > 0 && Q('p4pass1').value == Q('p4pass2').value);
-        }
-
-        function showCreateNewAccountDialogEx() {
-            meshserver.Send({ action: 'adduser', username: Q('p4name').value, email: Q('p4email').value, pass: Q('p4pass1').value });
-        }
-
-        function showUserAdminDialog(e, userid) {
-            if (xxdialogMode) return;
-            haltEvent(e);
-            var x = '<div>';
-            x += '<input type=checkbox onchange=showUserAdminDialogValidate() id=ua_fileaccess>Server Files, <input type=number onchange=showUserAdminDialogValidate() maxlength=10 style=width:80px;text-align:right id=ua_fileaccessquota>k max, blank for default<br><hr/>';
-            x += '<input type=checkbox onchange=showUserAdminDialogValidate() id=ua_fulladmin>Full Administrator<br>';
-            x += '<input type=checkbox onchange=showUserAdminDialogValidate() id=ua_serverbackup>Server Backup<br>';
-            x += '<input type=checkbox onchange=showUserAdminDialogValidate() id=ua_serverrestore>Server Restore<br>';
-            x += '<input type=checkbox onchange=showUserAdminDialogValidate() id=ua_manageusers>Manage Users<br>';
-            x += '</div>';
-            var user = users[userid];
-            setDialogMode(2, "Site Permissions", 3, showUserAdminDialogEx, x, user);
-            if (user.siteadmin && user.siteadmin != 0) {
-                Q('ua_fulladmin').checked = (user.siteadmin == 0xFFFFFFFF);
-                Q('ua_serverbackup').checked = ((user.siteadmin != 0xFFFFFFFF) && ((user.siteadmin & 1) != 0));     // Server Backup
-                Q('ua_manageusers').checked = ((user.siteadmin != 0xFFFFFFFF) && ((user.siteadmin & 2) != 0));      // Manage Users
-                Q('ua_serverrestore').checked = ((user.siteadmin != 0xFFFFFFFF) && ((user.siteadmin & 4) != 0));    // Server Restore
-                Q('ua_fileaccess').checked = ((user.siteadmin != 0xFFFFFFFF) && ((user.siteadmin & 8) != 0));       // Server Files
-            }
-            QE('ua_fulladmin', userinfo.siteadmin == 0xFFFFFFFF);
-            QE('ua_serverbackup', userinfo.siteadmin == 0xFFFFFFFF);
-            QE('ua_manageusers', userinfo.siteadmin == 0xFFFFFFFF);
-            QE('ua_serverrestore', userinfo.siteadmin == 0xFFFFFFFF);
-            QE('ua_fileaccess', userinfo.siteadmin == 0xFFFFFFFF);
-            Q('ua_fileaccessquota').value = (user.quota != undefined)?(user.quota / 1024):'';
-            showUserAdminDialogValidate();
-            return false;
-        }
-
-        function showUserAdminDialogValidate() {
-            if (userinfo.siteadmin == 0xFFFFFFFF) {
-                QE('ua_serverbackup', !Q('ua_fulladmin').checked);
-                QE('ua_manageusers', !Q('ua_fulladmin').checked);
-                QE('ua_serverrestore', !Q('ua_fulladmin').checked);
-                QE('ua_fileaccess', !Q('ua_fulladmin').checked);
-                QE('ua_fileaccessquota', Q('ua_fileaccess').checked || Q('ua_fulladmin').checked);
-            }
-        }
-
-        function showUserAdminDialogEx(button, user) {
-            var siteadmin = 0, quota = parseInt(Q('ua_fileaccessquota').value);
-            if (Q('ua_fulladmin').checked == true) { siteadmin = 0xFFFFFFFF; } else {
-                if (Q('ua_serverbackup').checked == true) siteadmin += 1;
-                if (Q('ua_manageusers').checked == true) siteadmin += 2;
-                if (Q('ua_serverrestore').checked == true) siteadmin += 4;
-                if (Q('ua_fileaccess').checked == true) siteadmin += 8;
-            }
-            var x = { action: 'edituser', name: user.name, siteadmin: siteadmin };
-            if (isNaN(quota) == false) { x.quota = (quota * 1024); }
-            meshserver.Send(x);
-        }
-
-        //
-        // FILE SELECTOR, DIALOG 3
-        //
-
-        function d3init() {
-            Q('d3localFile').value = '';
-            d3modechange();
-        }
-
-        function d3modechange() {
-            var mode = Q('d3uploadMode').value;
-            QV('d3localmode', mode == 1);
-            QV('d3servermode', mode == 2);
-            if (mode == 1) { d3setActions(); } else { d3updatefiles(); }
-        }
-
-        var d3filetreelinkpath;
-        var d3filetreelocation = [];
-
-        function d3updatefiles() {
-            if (Q('d3uploadMode').value == 1) return;
-            var html1 = '', html2 = '', filetreex = filetree, folderdepth = 1;
-
-            // Navigate to path location, build the paths at the same time
-            var d3filetreelocation2 = [], oldlinkpath = d3filetreelinkpath, checkedBoxes = [], checkboxes = document.getElementsByName('fc');
-            for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { checkedBoxes.push(checkboxes[i].value) }; } // Save all existing checked boxes
-
-            d3filetreelinkpath = '';
-            for (var i in d3filetreelocation) {
-                if ((filetreex.f != undefined) && (filetreex.f[d3filetreelocation[i]] != undefined)) {
-                    d3filetreelocation2.push(d3filetreelocation[i]);
-                    if ((folderdepth == 1)) {
-                        var sp = d3filetreelocation[i].split('/');
-                        publicPath = window.location + sp[0] + 'files/' + sp[2];
-                        if (d3filetreelocation[i] === userinfo._id) { d3filetreelinkpath += 'self'; } else { d3filetreelinkpath += (sp[0] + '/' + sp[2]); }
-                    } else {
-                        if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } }
-                    }
-                    filetreex = filetreex.f[d3filetreelocation[i]];
-                    folderdepth++;
-                } else {
-                    break;
-                }
-            }
-            d3filetreelocation = d3filetreelocation2; // In case we could not go down the full path, we set the new path location here.
-
-            // Sort the files
-            var filetreexx = p5sort_files(filetreex.f);
-
-            // Display all files and folders at this location
-            for (var i in filetreexx) {
-                // Figure out the name and shortname
-                var f = filetreexx[i], name = f.n, shortname;
-                shortname = name;
-                if (name.length > 70) { shortname = '<span title="' + EscapeHtml(name) + '">' + EscapeHtml(name.substring(0, 70)) + "...</span>"; } else { shortname = EscapeHtml(name); }
-                name = EscapeHtml(name);
-
-                // Figure out the size
-                var fsize = '';
-                if (f.s != undefined) { fsize = getFileSizeStr(f.s); }
-
-                var h = '';
-                if (f.t < 3) {
-                    var title = '';
-                    h = "<div class=filelist file=999><span style=float:right title=\"" + title + "\"></span><span><div class=fileIcon" + f.t + "></div>&nbsp;<a style=cursor:pointer onclick=d3folderset(\"" + encodeURIComponent(f.nx) + "\")>" + shortname + "</a></span></div>";
-                } else {
-                    var link = shortname;
-                    //if (f.s > 0) { link = "<a target=_blank href=\"downloadfile.ashx?link=" + encodeURIComponent(filetreelinkpath + '/' + f.nx) + "\">" + shortname + "</a>"; }
-                    h = "<div class=filelist file=3><input style=float:left name=fcx class=fcb type=checkbox onchange=d3setActions() value='" + f.nx + "'>&nbsp;<span style=float:right>" + fsize + "</span><span><div class=fileIcon" + f.t + "></div>" + link + "</span></div>";
-                }
-
-                if (f.t < 3) { html1 += h; } else { html2 += h; }
-            }
-
-            QH('d3serverfiles', html1 + html2);
-            QE('p3FolderUp', d3filetreelocation.length > 0);
-            d3setActions();
-        }
-
-        function d3folderset(x) { d3filetreelocation.push(decodeURIComponent(x)); d3updatefiles(); }
-        function d3folderup(x) { if (x == undefined) { d3filetreelocation.pop(); } else { while (d3filetreelocation.length > x) { d3filetreelocation.pop(); } } d3updatefiles(); }
-        function d3getFileSel() { var cc = []; var checkboxes = document.getElementsByName('fcx'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { cc.push(checkboxes[i].value) } } return cc; }
-        function d3setActions() {
-            var mode = Q('d3uploadMode').value;
-            if (mode == 1) {
-                QE('idx_dlgOkButton', Q('d3localFile').value.length > 0);
-            } else {
-                QE('idx_dlgOkButton', d3getFileSel().length == 1);
-            }
-        }
-
-        //
-        // NOTIFICATIONS
-        //
-
-        var notifications = [];
-
-        // Toggle showing notifications
-        function clickNotificationIcon(show) {
-            //addNotification({ icon:0, text:'test' });
-            if (show == true) { QV('notifiyBox', true); } else if (show == false) { QV('notifiyBox', false); } else { QV('notifiyBox', QS('notifiyBox')['display'] == 'none'); }
-            drawNotifications();
-        }
-
-        // Set the notification count on the upper right oft he screen
-        function setNotificationCount(c) {
-            if (parseInt(Q('notificationCount').innerHTML) == c) return; // If the count did not change, exit now.
-            QH('notificationCount', c);
-            QS('notificationCount')['background-color'] = (c == 0)?'lightblue':'orange';
-            QV('notificationCount', c > 0);
-        }
-
-        // Refresh the notification box
-        function drawNotifications() {
-            var r = '';
-            if (notifications.length == 0) {
-                r = '<div style=margin:5px>There are currently no notifications</div>';
-            } else {
-                for (var i in notifications) {
-                    var n = notifications[i];
-                    var t = '';
-                    var d = new Date(n.time);
-                    var icon = 0;
-                    if (n.nodeid != undefined) {
-                        var node = getNodeFromId(n.nodeid);
-                        if (node != null) {
-                            console.log(node);
-                            icon = node.icon;
-                            t = '<b>' + node.name + '</b>: '
-                        }
-                    }
-
-                    r += '<div title="Occured at ' + d.toLocaleString() + '" id="notifyx' + n.id + '" class=notification style="cursor:pointer;border-top:1px solid ' + ((r == '')?'transparent':'orange') + '"><div class=j' + icon + ' onclick="notificationSelected(' + n.id + ')" style=margin:5px;float:left></div><div onclick="notificationDelete(' + n.id + ')" class=unselectable title="Clear this notification" style=margin:5px;float:right;color:orange><b>X</b></div><div onclick="notificationSelected(' + n.id + ')" style=margin:5px>' + t + n.text + '</div></div>';
-                }
-            }
-            var deleteall = '';
-            if (notifications.length > 1) { deleteall = '<div id="notifyRemoveAll" onclick="deleteAllNotifications()" style="cursor:pointer;border-top:1px solid orange;margin:5px;color:orange;text-align:right;padding-right:3px">Clear all</div>'; }
-            QH('notifiyBox', '<div class=customScroll style="max-height:170px;overflow-y:auto;margin:5px">' + r + '</div>' + deleteall );
-        }
-
-        // A notification was selected
-        function notificationSelected(id) {
-            var j = -1;
-            for (var i in notifications) { if (notifications[i].id == id) { j = i; } }
-            if (j != -1) {
-                var n = notifications[j];
-                if (n.nodeid != undefined) {
-                    if (n.tag == 'desktop') gotoDevice(n.nodeid, 12); // Desktop
-                    else if (n.tag == 'terminal') gotoDevice(n.nodeid, 11); // Terminal
-                    else if (n.tag == 'files') gotoDevice(n.nodeid, 13); // Files
-                    else if (n.tag == 'intelamt') gotoDevice(n.nodeid, 14); // Intel AMT
-                    else if (n.tag == 'console') gotoDevice(n.nodeid, 15); // Files
-                    else gotoDevice(n.nodeid, 10); // General
-                }
-            }
-        }
-
-        // Remove one notification
-        function notificationDelete(id) {
-            var j = -1; e = Q('notifyx' + id);
-            if (e != null) {
-                for (var i in notifications) { if (notifications[i].id == id) { j = i; } }
-                if (j != -1) {
-                    notifications.splice(j, 1);
-                    e.parentNode.removeChild(e);
-                    setNotificationCount(notifications.length);
-                    if (notifications.length == 0) { QV('notifiyBox', false); }
-                    if (notifications.length == 1) { QV('notifyRemoveAll', false); }
-                    if ((notifications.length > 0) && (j == 0)) {
-                        var n = notifications[0];
-                        QS('notifyx' + n.id)['border-top'] = '1px solid transparent';
-                    }
-                }
-            }
-        }
-
-        // Add a new notification and play the notification sound
-        function addNotification(n) {
-            if (n.time == undefined) { n.time = Date.now(); }
-            if (n.id == undefined) { n.id = Math.random(); }
-            notifications.unshift(n);
-            setNotificationCount(notifications.length);
-            Q('chimes').play();
-            clickNotificationIcon(true);
-        }
-
-        // Remove all notifications
-        function deleteAllNotifications() {
-            notifications = [];
-            setNotificationCount(0);
-            drawNotifications();
-            QV('notifiyBox', false);
-        }
-
-        //
-        // POPUP DIALOG
-        //
-
-        // undefined = Hidden, 1 = Generic Message
-        var xxdialogMode;
-        var xxdialogFunc;
-        var xxdialogButtons;
-        var xxdialogTag;
-        var xxcurrentView = 0;
-
-        // Display a dialog box
-        // Parameters: Dialog Mode (0 = none), Dialog Title, Buttons (1 = OK, 2 = Cancel, 3 = OK & Cancel), Call back function(0 = Cancel, 1 = OK), Dialog Content (Mode 2 only)
-        function setDialogMode(x, y, b, f, c, tag) {
-            xxdialogMode = x;
-            xxdialogFunc = f;
-            xxdialogButtons = b;
-            xxdialogTag = tag;
-            QE('idx_dlgOkButton', true);
-            QV('idx_dlgOkButton', b & 1);
-            QV('idx_dlgCancelButton', b & 2);
-            QV('id_dialogclose', (b & 2) || (b & 8));
-            QV('idx_dlgDeleteButton', b & 4);
-            QV('idx_dlgButtonBar', b & 7);
-            if (y) QH('id_dialogtitle', y);
-            for (var i = 1; i < 24; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
-            QV('dialog', x);
-            if (c) { if (x == 2) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
-        }
-
-        function dialogclose(x) {
-            var f = xxdialogFunc;
-            var b = xxdialogButtons;
-            var t = xxdialogTag;
-            setDialogMode();
-            if (((b & 8) || x) && f) f(x, t);
-        }
-
-        function center() { QS('dialog').left = ((((getDocWidth() - 400) / 2)) + "px"); deskAdjust(); }
-        function messagebox(t, m) { QH('id_dialogMessage', m); setDialogMode(1, t, 1); }
-        function statusbox(t, m) { QH('id_dialogMessage', m); setDialogMode(1, t); }
-        function getDocWidth() { if (window.innerWidth) return window.innerWidth; if (document.documentElement && document.documentElement.clientWidth && document.documentElement.clientWidth != 0) return document.documentElement.clientWidth; return document.getElementsByTagName('body')[0].clientWidth; }
-
-        function go(x) {
-            if (xxdialogMode || xxcurrentView == x) return;
-            // Edit this line when adding a new screen
-            for (var i = 0; i < 22; i++) { QV('p' + i, i == x); }
-            xxcurrentView = x;
-
-            QV('topbar', x != 0);
-            if (x >= 10 && x < 20) { QS('MainMenuMyDevices')["background-color"] = "#606060"; } else { QS('MainMenuMyDevices')["background-color"] = ((x == 1) ? "#003366" : "#808080"); }
-            if (x >= 20 && x < 30) { QS('MainMenuMyAccount')["background-color"] = "#606060"; } else { QS('MainMenuMyAccount')["background-color"] = ((x == 2) ? "#003366" : "#808080"); }
-            QS('MainMenuMyEvents')["background-color"] = ((x == 3) ? "#003366" : "#808080");
-            QS('MainMenuMyUsers')["background-color"] = ((x == 4) ? "#003366" : "#808080");
-            QS('MainMenuMyFiles')["background-color"] = ((x == 5) ? "#003366" : "#808080");
-            QV('MainSubMenuSpan', x >= 10 && x < 20);
-            QS('MainDev')["background-color"] = ((x == 10) ? "#003366" : "#808080");
-            QS('MainDevDesktop')["background-color"] = ((x == 11) ? "#003366" : "#808080");
-            QS('MainDevTerminal')["background-color"] = ((x == 12) ? "#003366" : "#808080");
-            QS('MainDevFiles')["background-color"] = ((x == 13) ? "#003366" : "#808080");
-            QS('MainDevAmt')["background-color"] = ((x == 14) ? "#003366" : "#808080");
-            QS('MainDevConsole')["background-color"] = ((x == 15) ? "#003366" : "#808080");
-            QV('MeshSubMenuSpan', x >= 20 && x < 30);
-            QS('MeshGeneral')["background-color"] = ((x == 20) ? "#003366" : "#808080");
-            if (x == 15) { Q('p15consoleText').focus(); }
-        }
-
-        // Generic methods
-        function putstore(name, val) { try { if (typeof (localStorage) === "undefined") return; localStorage.setItem(name, val); } catch (e) { } }
-        function getstore(name, val) { try { if (typeof (localStorage) === "undefined") return val; var v = localStorage.getItem(name); if (typeof (v) === "undefined") return val; return v; } catch (e) { return val; } }
-        function addLink(x, f) { return "<a style=cursor:pointer;color:darkblue;text-decoration:none onclick='" + f + "'>&diams; " + x + "</a>"; }
-        function addLinkConditional(x, f, c) { if (c) return addLink(x, f); return x; }
-        function haltEvent(e) { if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false; }
-        function addOption(q, t, i) { var option = document.createElement("option"); option.text = t; option.value = i; Q(q).add(option); }
-        function passwordcheck(p) { var re = /(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%^&*()]).{8,}/; return re.test(p); }
-        function methodcheck(r) { if (r && r != null && r.Body && r.Body.ReturnValueStr != "SUCCESS") { messagebox("Call Error", r.Header.Method + ": " + r.Body.ReturnValueStr.replace("_", " ")); return true; } return false; }
-        function TableStart() { return "<table cellpadding=0 cellspacing=0 style=width:100%;border-radius:8px><tr><td width=200px><p><td>"; }
-        function TableStart2() { return "<table cellpadding=0 cellspacing=0 style=width:100%;border-radius:8px><tr><td><p><td>"; }
-        function TableEntry(n, v) { return "<tr><td><p>" + n + "<td>" + v; }
-        function FullTable(x, e) { var r = TableStart(); for (i in x) { if (i && x[i]) r += TableEntry(i, x[i]); } return r + TableEnd(e); }
-        function TableEnd(n) { return "<tr><td colspan=2><p>" + (n?n:'') + "</table>"; }
-        function AddButton(v, f) { return "<input type=button value='" + v + "' onclick='" + f + "' style=margin:4px>"; }
-        function AddButton2(v, f) { return "<input type=button value='" + v + "' onclick='" + f + "'>"; }
-        function AddRefreshButton(f) { return "<input type=button name=refreshbtn value=Refresh onclick='refreshButtons(false);" + f + "' style=margin:4px " + (refreshButtonsState==false?"disabled":"") + ">"; }
-        function MoreStart() { return "<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; More</a><div id=morexxx2 style=display:none><br><hr>"; };
-        function MoreEnd() { return "<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; Less</a></div>"; };
-        function getSelectedOptions(sel) { var opts = [], opt; for (var i = 0, len = sel.options.length; i < len; i++) { opt = sel.options[i]; if (opt.selected) { opts.push(opt.value); } } return opts; }
-        function getInstance(x, y) { for (var i in x) { if (x[i]["InstanceID"] == y) return x[i]; } return null; }
-        function getItem(x, y, z) { for (var i in x) { if (x[i][y] == z) return x[i]; } return null; }
-        function guidToStr(g) { return g.substring(6, 8) + g.substring(4, 6) + g.substring(2, 4) + g.substring(0, 2) + "-" + g.substring(10, 12) + g.substring(8, 10) + "-" + g.substring(14, 16) + g.substring(12, 14) + "-" + g.substring(16, 20) + "-" + g.substring(20); }
-        function getUrlVars() { var j, hash, vars = [], hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); for (var i = 0; i < hashes.length; i++) { j = hashes[i].indexOf('='); if (j > 0) { vars[hashes[i].substring(0, j)] = hashes[i].substring(j + 1, hashes[i].length); } } return vars; }
-        function getDocWidth() { if (window.innerWidth) return window.innerWidth; if (document.documentElement && document.documentElement.clientWidth && document.documentElement.clientWidth != 0) return document.documentElement.clientWidth; return document.getElementsByTagName('body')[0].clientWidth; }
-        //function addHtmlValue(t, v) { return '<div style=height:20px><div style=float:right;width:220px><b>' + v + '</b></div><div>' + t + '</div></div>'; }
-        function addHtmlValue(t, v) { return '<table><td style=width:120px>' + t + '<td><b>' + v + '</b></table>'; }
-    </script>
-</body>
-</html>
diff --git a/public/relay.htm b/public/relay.htm
deleted file mode 100644
index e30765b3..00000000
--- a/public/relay.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-    <script type="text/javascript" src="relay.js"></script>
-</head>
-<body>
-    <script>
-        var relay = createMeshConnection('0D49FDEFFB778D40C062DD34A3E96113:1485387591408:b2970207326684b4de5375d097db23c85e64497eaa72013b56a8ecd8063fb9b3').connect();
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/public/relay.js b/public/relay.js
deleted file mode 100644
index 6b1f4f65..00000000
--- a/public/relay.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/** 
-* @fileoverview Dynamic interface to MeshCentral2
-* @author Ylian Saint-Hilaire
-* @version v0.0.1
-*/
-
-var createMeshConnection = function (connectionId) {
-    var obj = {};
-    obj.connectionId = connectionId;
-    obj.state = 0;
-    obj.websocket = null;
-    obj.onStateChanged = null;
-    obj.onData = null;
-        
-    obj.connect = function () {
-        if (obj.state == 0) {
-            obj.websocket = new WebSocket(window.location.protocol.replace('http', 'ws') + '//' + window.location.host + '/meshrelay.ashx?id=' + obj.connectionId);
-            obj.websocket.binaryType = "arraybuffer";
-            obj.websocket.onopen = function (e) { console.log('WebSocket Connected', e); };
-            obj.websocket.onmessage = function (e) {
-                console.log('WebSocket Message', e);
-                if ((obj.state = 1) && (e.data == 'c')) {
-                    obj.state = 2;
-                    if (obj.onStateChanged) { onStateChanged(obj, 2); }
-                    console.log('WebSocket Peer Connection', e);
-                    obj.send('bob');
-                } else {
-                    if (obj.onData != null) { obj.onData(obj, e.data); }
-                }
-            };
-            obj.websocket.onclose = function (e) {
-                console.log('WebSocket Closed', e);
-                obj.state = 0;
-                if (obj.onStateChanged) { onStateChanged(obj, 0); }
-            };
-            obj.websocket.onerror = function (e) { console.log('WebSocket Error', e); };
-            obj.state = 1;
-            if (obj.onStateChanged) { onStateChanged(obj, 1); }
-        }
-        return obj;
-    };
-    
-    obj.send = function (data) {
-        if ((obj.state == 2) && (obj.websocket != null)) { obj.websocket.send(data); }
-    };
-
-    return obj;
-}
\ No newline at end of file
diff --git a/public/scripts/inflate.js b/public/scripts/inflate.js
deleted file mode 100644
index e602d957..00000000
--- a/public/scripts/inflate.js
+++ /dev/null
@@ -1,732 +0,0 @@
-    /*
-     * Port of script by Masanao Izumo.
-     *
-     * Wrapped all the variables in a function, created a
-     * constructor for interacting with the lib. Everything
-     * else was written by M. Izumo.
-     *
-     * Original code can be found here: http://www.onicos.com/staff/iz/amuse/javascript/expert/inflate.txt
-     *
-     */
-
-    var zip_WSIZE = 32768;		// Sliding Window size
-    var zip_STORED_BLOCK = 0;
-    var zip_STATIC_TREES = 1;
-    var zip_DYN_TREES = 2;
-
-    /* for inflate */
-    var zip_lbits = 9; 		// bits in base literal/length lookup table
-    var zip_dbits = 6; 		// bits in base distance lookup table
-    var zip_INBUFSIZ = 32768;	// Input buffer size
-    var zip_INBUF_EXTRA = 64;	// Extra buffer
-
-    /* variables (inflate) */
-    var zip_slide;
-    var zip_wp;			// current position in slide
-    var zip_fixed_tl = null;	// inflate static
-    var zip_fixed_td;		// inflate static
-    var zip_fixed_bl, fixed_bd;	// inflate static
-    var zip_bit_buf;		// bit buffer
-    var zip_bit_len;		// bits in bit buffer
-    var zip_method;
-    var zip_eof;
-    var zip_copy_leng;
-    var zip_copy_dist;
-    var zip_tl, zip_td;	// literal/length and distance decoder tables
-    var zip_bl, zip_bd;	// number of bits decoded by tl and td
-
-    var zip_inflate_data;
-    var zip_inflate_pos;
-
-
-    /* constant tables (inflate) */
-    var zip_MASK_BITS = new Array(
-        0x0000,
-        0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
-        0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff);
-    // Tables for deflate from PKZIP's appnote.txt.
-    var zip_cplens = new Array( // Copy lengths for literal codes 257..285
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0);
-    /* note: see note #13 above about the 258 in this list. */
-    var zip_cplext = new Array( // Extra bits for literal codes 257..285
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99); // 99==invalid
-    var zip_cpdist = new Array( // Copy offsets for distance codes 0..29
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577);
-    var zip_cpdext = new Array( // Extra bits for distance codes
-        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-        12, 12, 13, 13);
-    var zip_border = new Array(  // Order of the bit length code lengths
-        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15);
-    /* objects (inflate) */
-
-    function zip_HuftList() {
-        this.next = null;
-        this.list = null;
-    }
-
-    function zip_HuftNode() {
-        this.e = 0; // number of extra bits or operation
-        this.b = 0; // number of bits in this code or subcode
-
-        // union
-        this.n = 0; // literal, length base, or distance base
-        this.t = null; // (zip_HuftNode) pointer to next level of table
-    }
-
-    function zip_HuftBuild(b,	// code lengths in bits (all assumed <= BMAX)
-                           n,	// number of codes (assumed <= N_MAX)
-                           s,	// number of simple-valued codes (0..s-1)
-                           d,	// list of base values for non-simple codes
-                           e,	// list of extra bits for non-simple codes
-                           mm	// maximum lookup bits
-                          ) {
-        this.BMAX = 16;   // maximum bit length of any code
-        this.N_MAX = 288; // maximum number of codes in any set
-        this.status = 0;	// 0: success, 1: incomplete table, 2: bad input
-        this.root = null;	// (zip_HuftList) starting table
-        this.m = 0;		// maximum lookup bits, returns actual
-
-        /* Given a list of code lengths and a maximum table size, make a set of
-           tables to decode that set of codes.	Return zero on success, one if
-           the given code set is incomplete (the tables are still built in this
-           case), two if the input is invalid (all zero length codes or an
-           oversubscribed set of lengths), and three if not enough memory.
-           The code with value 256 is special, and the tables are constructed
-           so that no bits beyond that code are fetched when that code is
-           decoded. */
-        {
-            var a;			// counter for codes of length k
-            var c = new Array(this.BMAX + 1);	// bit length count table
-            var el;			// length of EOB code (value 256)
-            var f;			// i repeats in table every f entries
-            var g;			// maximum code length
-            var h;			// table level
-            var i;			// counter, current code
-            var j;			// counter
-            var k;			// number of bits in current code
-            var lx = new Array(this.BMAX + 1);	// stack of bits per table
-            var p;			// pointer into c[], b[], or v[]
-            var pidx;		// index of p
-            var q;			// (zip_HuftNode) points to current table
-            var r = new zip_HuftNode(); // table entry for structure assignment
-            var u = new Array(this.BMAX); // zip_HuftNode[BMAX][]  table stack
-            var v = new Array(this.N_MAX); // values in order of bit length
-            var w;
-            var x = new Array(this.BMAX + 1);// bit offsets, then code stack
-            var xp;			// pointer into x or c
-            var y;			// number of dummy codes added
-            var z;			// number of entries in current table
-            var o;
-            var tail;		// (zip_HuftList)
-
-            tail = this.root = null;
-            for (i = 0; i < c.length; i++)
-                c[i] = 0;
-            for (i = 0; i < lx.length; i++)
-                lx[i] = 0;
-            for (i = 0; i < u.length; i++)
-                u[i] = null;
-            for (i = 0; i < v.length; i++)
-                v[i] = 0;
-            for (i = 0; i < x.length; i++)
-                x[i] = 0;
-
-            // Generate counts for each bit length
-            el = n > 256 ? b[256] : this.BMAX; // set length of EOB code, if any
-            p = b; pidx = 0;
-            i = n;
-            do {
-                c[p[pidx]]++;	// assume all entries <= BMAX
-                pidx++;
-            } while (--i > 0);
-            if (c[0] == n) {	// null input--all zero length codes
-                this.root = null;
-                this.m = 0;
-                this.status = 0;
-                return;
-            }
-
-            // Find minimum and maximum length, bound *m by those
-            for (j = 1; j <= this.BMAX; j++)
-                if (c[j] != 0)
-                    break;
-            k = j;			// minimum code length
-            if (mm < j)
-                mm = j;
-            for (i = this.BMAX; i != 0; i--)
-                if (c[i] != 0)
-                    break;
-            g = i;			// maximum code length
-            if (mm > i)
-                mm = i;
-
-            // Adjust last length count to fill out codes, if needed
-            for (y = 1 << j; j < i; j++, y <<= 1)
-                if ((y -= c[j]) < 0) {
-                    this.status = 2;	// bad input: more codes than bits
-                    this.m = mm;
-                    return;
-                }
-            if ((y -= c[i]) < 0) {
-                this.status = 2;
-                this.m = mm;
-                return;
-            }
-            c[i] += y;
-
-            // Generate starting offsets into the value table for each length
-            x[1] = j = 0;
-            p = c;
-            pidx = 1;
-            xp = 2;
-            while (--i > 0)		// note that i == g from above
-                x[xp++] = (j += p[pidx++]);
-
-            // Make a table of values in order of bit lengths
-            p = b; pidx = 0;
-            i = 0;
-            do {
-                if ((j = p[pidx++]) != 0)
-                    v[x[j]++] = i;
-            } while (++i < n);
-            n = x[g];			// set n to length of v
-
-            // Generate the Huffman codes and for each, make the table entries
-            x[0] = i = 0;		// first Huffman code is zero
-            p = v; pidx = 0;		// grab values in bit order
-            h = -1;			// no tables yet--level -1
-            w = lx[0] = 0;		// no bits decoded yet
-            q = null;			// ditto
-            z = 0;			// ditto
-
-            // go through the bit lengths (k already is bits in shortest code)
-            for (; k <= g; k++) {
-                a = c[k];
-                while (a-- > 0) {
-                    // here i is the Huffman code of length k bits for value p[pidx]
-                    // make tables up to required level
-                    while (k > w + lx[1 + h]) {
-                        w += lx[1 + h]; // add bits already decoded
-                        h++;
-
-                        // compute minimum size table less than or equal to *m bits
-                        z = (z = g - w) > mm ? mm : z; // upper limit
-                        if ((f = 1 << (j = k - w)) > a + 1) { // try a k-w bit table
-                            // too few codes for k-w bit table
-                            f -= a + 1;	// deduct codes from patterns left
-                            xp = k;
-                            while (++j < z) { // try smaller tables up to z bits
-                                if ((f <<= 1) <= c[++xp])
-                                    break;	// enough codes to use up j bits
-                                f -= c[xp];	// else deduct codes from patterns
-                            }
-                        }
-                        if (w + j > el && w < el)
-                            j = el - w;	// make EOB code end at table
-                        z = 1 << j;	// table entries for j-bit table
-                        lx[1 + h] = j; // set table size in stack
-
-                        // allocate and link in new table
-                        q = new Array(z);
-                        for (o = 0; o < z; o++) {
-                            q[o] = new zip_HuftNode();
-                        }
-
-                        if (tail == null)
-                            tail = this.root = new zip_HuftList();
-                        else
-                            tail = tail.next = new zip_HuftList();
-                        tail.next = null;
-                        tail.list = q;
-                        u[h] = q;	// table starts after link
-
-                        /* connect to last table, if there is one */
-                        if (h > 0) {
-                            x[h] = i;		// save pattern for backing up
-                            r.b = lx[h];	// bits to dump before this table
-                            r.e = 16 + j;	// bits in this table
-                            r.t = q;		// pointer to this table
-                            j = (i & ((1 << w) - 1)) >> (w - lx[h]);
-                            u[h - 1][j].e = r.e;
-                            u[h - 1][j].b = r.b;
-                            u[h - 1][j].n = r.n;
-                            u[h - 1][j].t = r.t;
-                        }
-                    }
-
-                    // set up table entry in r
-                    r.b = k - w;
-                    if (pidx >= n)
-                        r.e = 99;		// out of values--invalid code
-                    else if (p[pidx] < s) {
-                        r.e = (p[pidx] < 256 ? 16 : 15); // 256 is end-of-block code
-                        r.n = p[pidx++];	// simple code is just the value
-                    } else {
-                        r.e = e[p[pidx] - s];	// non-simple--look up in lists
-                        r.n = d[p[pidx++] - s];
-                    }
-
-                    // fill code-like entries with r //
-                    f = 1 << (k - w);
-                    for (j = i >> w; j < z; j += f) {
-                        q[j].e = r.e;
-                        q[j].b = r.b;
-                        q[j].n = r.n;
-                        q[j].t = r.t;
-                    }
-
-                    // backwards increment the k-bit code i
-                    for (j = 1 << (k - 1) ; (i & j) != 0; j >>= 1)
-                        i ^= j;
-                    i ^= j;
-
-                    // backup over finished tables
-                    while ((i & ((1 << w) - 1)) != x[h]) {
-                        w -= lx[h];		// don't need to update q
-                        h--;
-                    }
-                }
-            }
-
-            /* return actual size of base table */
-            this.m = lx[1];
-
-            /* Return true (1) if we were given an incomplete table */
-            this.status = ((y != 0 && g != 1) ? 1 : 0);
-        } /* end of constructor */
-    }
-
-
-    /* routines (inflate) */
-
-    function zip_GET_BYTE() {
-        if (zip_inflate_data.length == zip_inflate_pos)
-            return -1;
-        return zip_inflate_data.charCodeAt(zip_inflate_pos++) & 0xff;
-    }
-
-    function zip_NEEDBITS(n) {
-        while (zip_bit_len < n) {
-            zip_bit_buf |= zip_GET_BYTE() << zip_bit_len;
-            zip_bit_len += 8;
-        }
-    }
-
-    function zip_GETBITS(n) {
-        return zip_bit_buf & zip_MASK_BITS[n];
-    }
-
-    function zip_DUMPBITS(n) {
-        zip_bit_buf >>= n;
-        zip_bit_len -= n;
-    }
-
-    function zip_inflate_codes(buff, off, size) {
-        /* inflate (decompress) the codes in a deflated (compressed) block.
-           Return an error code or zero if it all goes ok. */
-        var e;		// table entry flag/number of extra bits
-        var t;		// (zip_HuftNode) pointer to table entry
-        var n;
-
-        if (size == 0)
-            return 0;
-
-        // inflate the coded data
-        n = 0;
-        for (; ;) {			// do until end of block
-            zip_NEEDBITS(zip_bl);
-            t = zip_tl.list[zip_GETBITS(zip_bl)];
-            e = t.e;
-            while (e > 16) {
-                if (e == 99)
-                    return -1;
-                zip_DUMPBITS(t.b);
-                e -= 16;
-                zip_NEEDBITS(e);
-                t = t.t[zip_GETBITS(e)];
-                e = t.e;
-            }
-            zip_DUMPBITS(t.b);
-
-            if (e == 16) {		// then it's a literal
-                zip_wp &= zip_WSIZE - 1;
-                buff[off + n++] = zip_slide[zip_wp++] = t.n;
-                if (n == size)
-                    return size;
-                continue;
-            }
-
-            // exit if end of block
-            if (e == 15)
-                break;
-
-            // it's an EOB or a length
-
-            // get length of block to copy
-            zip_NEEDBITS(e);
-            zip_copy_leng = t.n + zip_GETBITS(e);
-            zip_DUMPBITS(e);
-
-            // decode distance of block to copy
-            zip_NEEDBITS(zip_bd);
-            t = zip_td.list[zip_GETBITS(zip_bd)];
-            e = t.e;
-
-            while (e > 16) {
-                if (e == 99)
-                    return -1;
-                zip_DUMPBITS(t.b);
-                e -= 16;
-                zip_NEEDBITS(e);
-                t = t.t[zip_GETBITS(e)];
-                e = t.e;
-            }
-            zip_DUMPBITS(t.b);
-            zip_NEEDBITS(e);
-            zip_copy_dist = zip_wp - t.n - zip_GETBITS(e);
-            zip_DUMPBITS(e);
-
-            // do the copy
-            while (zip_copy_leng > 0 && n < size) {
-                zip_copy_leng--;
-                zip_copy_dist &= zip_WSIZE - 1;
-                zip_wp &= zip_WSIZE - 1;
-                buff[off + n++] = zip_slide[zip_wp++]
-                    = zip_slide[zip_copy_dist++];
-            }
-
-            if (n == size)
-                return size;
-        }
-
-        zip_method = -1; // done
-        return n;
-    }
-
-    function zip_inflate_stored(buff, off, size) {
-        /* "decompress" an inflated type 0 (stored) block. */
-        var n;
-
-        // go to byte boundary
-        n = zip_bit_len & 7;
-        zip_DUMPBITS(n);
-
-        // get the length and its complement
-        zip_NEEDBITS(16);
-        n = zip_GETBITS(16);
-        zip_DUMPBITS(16);
-        zip_NEEDBITS(16);
-        if (n != ((~zip_bit_buf) & 0xffff))
-            return -1;			// error in compressed data
-        zip_DUMPBITS(16);
-
-        // read and output the compressed data
-        zip_copy_leng = n;
-
-        n = 0;
-        while (zip_copy_leng > 0 && n < size) {
-            zip_copy_leng--;
-            zip_wp &= zip_WSIZE - 1;
-            zip_NEEDBITS(8);
-            buff[off + n++] = zip_slide[zip_wp++] =
-                zip_GETBITS(8);
-            zip_DUMPBITS(8);
-        }
-
-        if (zip_copy_leng == 0)
-            zip_method = -1; // done
-        return n;
-    }
-
-    function zip_inflate_fixed(buff, off, size) {
-        /* decompress an inflated type 1 (fixed Huffman codes) block.  We should
-           either replace this with a custom decoder, or at least precompute the
-           Huffman tables. */
-
-        // if first time, set up tables for fixed blocks
-        if (zip_fixed_tl == null) {
-            var i;			// temporary variable
-            var l = new Array(288);	// length list for huft_build
-            var h;	// zip_HuftBuild
-
-            // literal table
-            for (i = 0; i < 144; i++)
-                l[i] = 8;
-            for (; i < 256; i++)
-                l[i] = 9;
-            for (; i < 280; i++)
-                l[i] = 7;
-            for (; i < 288; i++)	// make a complete, but wrong code set
-                l[i] = 8;
-            zip_fixed_bl = 7;
-
-            h = new zip_HuftBuild(l, 288, 257, zip_cplens, zip_cplext,
-                                  zip_fixed_bl);
-            if (h.status != 0) {
-                alert("HufBuild error: " + h.status);
-                return -1;
-            }
-            zip_fixed_tl = h.root;
-            zip_fixed_bl = h.m;
-
-            // distance table
-            for (i = 0; i < 30; i++)	// make an incomplete code set
-                l[i] = 5;
-            zip_fixed_bd = 5;
-
-            h = new zip_HuftBuild(l, 30, 0, zip_cpdist, zip_cpdext, zip_fixed_bd);
-            if (h.status > 1) {
-                zip_fixed_tl = null;
-                alert("HufBuild error: " + h.status);
-                return -1;
-            }
-            zip_fixed_td = h.root;
-            zip_fixed_bd = h.m;
-        }
-
-        zip_tl = zip_fixed_tl;
-        zip_td = zip_fixed_td;
-        zip_bl = zip_fixed_bl;
-        zip_bd = zip_fixed_bd;
-        return zip_inflate_codes(buff, off, size);
-    }
-
-    function zip_inflate_dynamic(buff, off, size) {
-        // decompress an inflated type 2 (dynamic Huffman codes) block.
-        var i;		// temporary variables
-        var j;
-        var l;		// last length
-        var n;		// number of lengths to get
-        var t;		// (zip_HuftNode) literal/length code table
-        var nb;		// number of bit length codes
-        var nl;		// number of literal/length codes
-        var nd;		// number of distance codes
-        var ll = new Array(286 + 30); // literal/length and distance code lengths
-        var h;		// (zip_HuftBuild)
-
-        for (i = 0; i < ll.length; i++)
-            ll[i] = 0;
-
-        // read in table lengths
-        zip_NEEDBITS(5);
-        nl = 257 + zip_GETBITS(5);	// number of literal/length codes
-        zip_DUMPBITS(5);
-        zip_NEEDBITS(5);
-        nd = 1 + zip_GETBITS(5);	// number of distance codes
-        zip_DUMPBITS(5);
-        zip_NEEDBITS(4);
-        nb = 4 + zip_GETBITS(4);	// number of bit length codes
-        zip_DUMPBITS(4);
-        if (nl > 286 || nd > 30)
-            return -1;		// bad lengths
-
-        // read in bit-length-code lengths
-        for (j = 0; j < nb; j++) {
-            zip_NEEDBITS(3);
-            ll[zip_border[j]] = zip_GETBITS(3);
-            zip_DUMPBITS(3);
-        }
-        for (; j < 19; j++)
-            ll[zip_border[j]] = 0;
-
-        // build decoding table for trees--single level, 7 bit lookup
-        zip_bl = 7;
-        h = new zip_HuftBuild(ll, 19, 19, null, null, zip_bl);
-        if (h.status != 0)
-            return -1;	// incomplete code set
-
-        zip_tl = h.root;
-        zip_bl = h.m;
-
-        // read in literal and distance code lengths
-        n = nl + nd;
-        i = l = 0;
-        while (i < n) {
-            zip_NEEDBITS(zip_bl);
-            t = zip_tl.list[zip_GETBITS(zip_bl)];
-            j = t.b;
-            zip_DUMPBITS(j);
-            j = t.n;
-            if (j < 16)		// length of code in bits (0..15)
-                ll[i++] = l = j;	// save last length in l
-            else if (j == 16) {	// repeat last length 3 to 6 times
-                zip_NEEDBITS(2);
-                j = 3 + zip_GETBITS(2);
-                zip_DUMPBITS(2);
-                if (i + j > n)
-                    return -1;
-                while (j-- > 0)
-                    ll[i++] = l;
-            } else if (j == 17) {	// 3 to 10 zero length codes
-                zip_NEEDBITS(3);
-                j = 3 + zip_GETBITS(3);
-                zip_DUMPBITS(3);
-                if (i + j > n)
-                    return -1;
-                while (j-- > 0)
-                    ll[i++] = 0;
-                l = 0;
-            } else {		// j == 18: 11 to 138 zero length codes
-                zip_NEEDBITS(7);
-                j = 11 + zip_GETBITS(7);
-                zip_DUMPBITS(7);
-                if (i + j > n)
-                    return -1;
-                while (j-- > 0)
-                    ll[i++] = 0;
-                l = 0;
-            }
-        }
-
-        // build the decoding tables for literal/length and distance codes
-        zip_bl = zip_lbits;
-        h = new zip_HuftBuild(ll, nl, 257, zip_cplens, zip_cplext, zip_bl);
-        if (zip_bl == 0)	// no literals or lengths
-            h.status = 1;
-        if (h.status != 0) {
-            if (h.status == 1)
-                ;// **incomplete literal tree**
-            return -1;		// incomplete code set
-        }
-        zip_tl = h.root;
-        zip_bl = h.m;
-
-        for (i = 0; i < nd; i++)
-            ll[i] = ll[i + nl];
-        zip_bd = zip_dbits;
-        h = new zip_HuftBuild(ll, nd, 0, zip_cpdist, zip_cpdext, zip_bd);
-        zip_td = h.root;
-        zip_bd = h.m;
-
-        if (zip_bd == 0 && nl > 257) {   // lengths but no distances
-            // **incomplete distance tree**
-            return -1;
-        }
-
-        if (h.status == 1) {
-            ;// **incomplete distance tree**
-        }
-        if (h.status != 0)
-            return -1;
-
-        // decompress until an end-of-block code
-        return zip_inflate_codes(buff, off, size);
-    }
-
-    function zip_inflate_internal(buff, off, size) {
-        // decompress an inflated entry
-        var n, i;
-
-        n = 0;
-        while (n < size) {
-            if (zip_eof && zip_method == -1)
-                return n;
-
-            if (zip_copy_leng > 0) {
-                if (zip_method != zip_STORED_BLOCK) {
-                    // STATIC_TREES or DYN_TREES
-                    while (zip_copy_leng > 0 && n < size) {
-                        zip_copy_leng--;
-                        zip_copy_dist &= zip_WSIZE - 1;
-                        zip_wp &= zip_WSIZE - 1;
-                        buff[off + n++] = zip_slide[zip_wp++] =
-                            zip_slide[zip_copy_dist++];
-                    }
-                } else {
-                    while (zip_copy_leng > 0 && n < size) {
-                        zip_copy_leng--;
-                        zip_wp &= zip_WSIZE - 1;
-                        zip_NEEDBITS(8);
-                        buff[off + n++] = zip_slide[zip_wp++] = zip_GETBITS(8);
-                        zip_DUMPBITS(8);
-                    }
-                    if (zip_copy_leng == 0)
-                        zip_method = -1; // done
-                }
-                if (n == size)
-                    return n;
-            }
-
-            if (zip_method == -1) {
-                if (zip_eof)
-                    break;
-
-                // read in last block bit
-                zip_NEEDBITS(1);
-                if (zip_GETBITS(1) != 0)
-                    zip_eof = true;
-                zip_DUMPBITS(1);
-
-                // read in block type
-                zip_NEEDBITS(2);
-                zip_method = zip_GETBITS(2);
-                zip_DUMPBITS(2);
-                zip_tl = null;
-                zip_copy_leng = 0;
-            }
-
-            switch (zip_method) {
-                case 0: // zip_STORED_BLOCK
-                    i = zip_inflate_stored(buff, off + n, size - n);
-                    break;
-
-                case 1: // zip_STATIC_TREES
-                    if (zip_tl != null)
-                        i = zip_inflate_codes(buff, off + n, size - n);
-                    else
-                        i = zip_inflate_fixed(buff, off + n, size - n);
-                    break;
-
-                case 2: // zip_DYN_TREES
-                    if (zip_tl != null)
-                        i = zip_inflate_codes(buff, off + n, size - n);
-                    else
-                        i = zip_inflate_dynamic(buff, off + n, size - n);
-                    break;
-
-                default: // error
-                    i = -1;
-                    break;
-            }
-
-            if (i == -1) {
-                if (zip_eof)
-                    return 0;
-                return -1;
-            }
-            n += i;
-        }
-        return n;
-    }
-
-    function zip_inflate_start() {
-        if (zip_slide == null) zip_slide = new Array(2 * zip_WSIZE);
-        zip_wp = 0;
-        zip_bit_buf = 0;
-        zip_bit_len = 0;
-        zip_method = -1;
-        zip_eof = false;
-        zip_copy_leng = zip_copy_dist = 0;
-        zip_tl = null;
-    }
-
-    inflate_start = function () { zip_inflate_start(); };
-    inflate = function (data) {
-        var out = "", buff = [], i, j;
-        zip_bit_buf = 0;
-        zip_bit_len = 0;
-        zip_method = -1;
-        zip_eof = false;
-        zip_inflate_data = data;
-        zip_inflate_pos = 0;
-    
-        do { i = zip_inflate_internal(buff, buff.length, 1024); } while (i > 0);
-        zip_inflate_data = null; // G.C.
-
-        return buff;
-    };
diff --git a/redirserver.js b/redirserver.js
index 251ae9a2..bdbef140 100644
--- a/redirserver.js
+++ b/redirserver.js
@@ -29,7 +29,8 @@ module.exports.CreateRedirServer = function (parent, db, args, func) {
             host = obj.certificates.CommonName;
             if ((obj.certificates.CommonName == 'sample.org') || (obj.certificates.CommonName == 'un-configured')) { host = req.headers.host; }
         }
-        if (req.headers && req.headers.host && (req.headers.host.split(':')[0].toLowerCase() == 'localhost')) { res.redirect('https://localhost:' + args.port + req.url); } else { res.redirect('https://' + host + ':' + args.port + req.url); }
+        var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
+        if (req.headers && req.headers.host && (req.headers.host.split(':')[0].toLowerCase() == 'localhost')) { res.redirect('https://localhost:' + httpsPort + req.url); } else { res.redirect('https://' + host + ':' + httpsPort + req.url); }
     }
     
     // Return the current domain of the request
diff --git a/webserver.js b/webserver.js
index 0e684b27..4a19a782 100644
--- a/webserver.js
+++ b/webserver.js
@@ -685,14 +685,16 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
             
             // Send the master web application
             if ((!obj.args.user) && (obj.args.nousers != true) && (nologout == false)) { logoutcontrol += ' <a href=' + domain.url + 'logout?' + Math.random() + ' style=color:white>Logout</a>'; } // If a default user is in use or no user mode, don't display the logout button
-            res.render(obj.path.join(__dirname, 'views/default'), { viewmode: viewmode, currentNode: currentNode, logoutControl: logoutcontrol, title: domain.title, title2: domain.title2, domainurl: domain.url, domain: domain.id, debuglevel: parent.debugLevel, serverDnsName: getWebServerName(domain), serverRedirPort: args.redirport, serverPublicPort: args.port, noServerBackup: (args.noserverbackup == 1 ? 1 : 0), features: features, mpspass: args.mpspass, webcerthash: obj.webCertificateHashBase64, footer: (domain.footer == null) ? '' : domain.footer });
+            var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
+            res.render(obj.path.join(__dirname, 'views/default'), { viewmode: viewmode, currentNode: currentNode, logoutControl: logoutcontrol, title: domain.title, title2: domain.title2, domainurl: domain.url, domain: domain.id, debuglevel: parent.debugLevel, serverDnsName: getWebServerName(domain), serverRedirPort: args.redirport, serverPublicPort: httpsPort, noServerBackup: (args.noserverbackup == 1 ? 1 : 0), features: features, mpspass: args.mpspass, webcerthash: obj.webCertificateHashBase64, footer: (domain.footer == null) ? '' : domain.footer });
         } else {
             // Send back the login application
             var loginmode = req.session.loginmode;
             delete req.session.loginmode; // Clear this state, if the user hits refresh, we want to go back to the login page.
             var features = 0;
             if ((parent.config != null) && (parent.config.settings != null) && (parent.config.settings.allowframing == true)) { features += 32; } // Allow site within iframe
-            res.render(obj.path.join(__dirname, 'views/login'), { loginmode: loginmode, rootCertLink: getRootCertLink(), title: domain.title, title2: domain.title2, newAccount: domain.newaccounts, newAccountPass: (((domain.newaccountspass == null) || (domain.newaccountspass == '')) ? 0 : 1), serverDnsName: getWebServerName(domain), serverPublicPort: obj.args.port, emailcheck: obj.parent.mailserver != null, features: features, footer: (domain.footer == null) ? '' : domain.footer });
+            var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
+            res.render(obj.path.join(__dirname, 'views/login'), { loginmode: loginmode, rootCertLink: getRootCertLink(), title: domain.title, title2: domain.title2, newAccount: domain.newaccounts, newAccountPass: (((domain.newaccountspass == null) || (domain.newaccountspass == '')) ? 0 : 1), serverDnsName: getWebServerName(domain), serverPublicPort: httpsPort, emailcheck: obj.parent.mailserver != null, features: features, footer: (domain.footer == null) ? '' : domain.footer });
         }
     }
     
@@ -767,6 +769,7 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
                     var scriptEngine = require('./amtscript.js').CreateAmtScriptEngine();
                     var runscript = scriptEngine.script_blocksToScript(scriptFile.blocks, scriptFile.scriptBlocks);
                     scriptFile.mescript = new Buffer(scriptEngine.script_compile(runscript), 'binary').toString('base64');
+                    scriptFile.scriptText = runscript;
 
                     // Send the script
                     res.send(new Buffer(JSON.stringify(scriptFile, null, ' ')));
@@ -792,6 +795,7 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
                     var scriptEngine = require('./amtscript.js').CreateAmtScriptEngine();
                     var runscript = scriptEngine.script_blocksToScript(scriptFile.blocks, scriptFile.scriptBlocks);
                     scriptFile.mescript = new Buffer(scriptEngine.script_compile(runscript), 'binary').toString('base64');
+                    scriptFile.scriptText = runscript;
 
                     // Send the script
                     res.send(new Buffer(JSON.stringify(scriptFile, null, ' ')));
@@ -1434,13 +1438,14 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
 
                     var meshidhex = new Buffer(req.query.meshid.replace(/\@/g, '+').replace(/\$/g, '/'), 'base64').toString('hex').toUpperCase();
                     var serveridhex = new Buffer(obj.agentCertificateHashBase64.replace(/\@/g, '+').replace(/\$/g, '/'), 'base64').toString('hex').toUpperCase();
+                    var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
 
                     // Build the agent connection URL. If we are using a sub-domain or one with a DNS, we need to craft the URL correctly.
                     var xdomain = (domain.dns == null) ? domain.id : '';
                     if (xdomain != '') xdomain += "/";
                     var meshsettings = "MeshName=" + mesh.name + "\r\nMeshType=" + mesh.mtype + "\r\nMeshID=0x" + meshidhex + "\r\nServerID=" + serveridhex + "\r\n";
-                    if (obj.args.lanonly != true) { meshsettings += "MeshServer=ws" + (obj.args.notls ? '' : 's') + "://" + getWebServerName(domain) + ":" + obj.args.port + "/" + xdomain + "agent.ashx\r\n"; } else { meshsettings += "MeshServer=local"; }
-                    if (req.query.tag != true) { meshsettings += "Tag=" + req.query.tag + "\r\n"; }
+                    if (obj.args.lanonly != true) { meshsettings += "MeshServer=ws" + (obj.args.notls ? '' : 's') + "://" + getWebServerName(domain) + ":" + httpsPort + "/" + xdomain + "agent.ashx\r\n"; } else { meshsettings += "MeshServer=local"; }
+                    if (req.query.tag != null) { meshsettings += "Tag=" + req.query.tag + "\r\n"; }
                     res.set({ 'Cache-Control': 'no-cache, no-store, must-revalidate', 'Pragma': 'no-cache', 'Expires': '0', 'Content-Type': 'application/octet-stream', 'Content-Disposition': 'attachment; filename=' + argentInfo.rname });
                     obj.parent.exeHandler.streamExeWithMeshPolicy({ platform: 'win32', sourceFileName: obj.parent.meshAgentBinaries[req.query.id].path, destinationStream: res, msh: meshsettings, peinfo: obj.parent.meshAgentBinaries[req.query.id].pe });
                 });
@@ -1453,11 +1458,19 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
             res.sendFile(scriptInfo.path);
         } else if (req.query.meshcmd != null) {
             // Send meshcmd for a specific platform back
-            var argentInfo = obj.parent.meshAgentBinaries[req.query.meshcmd];
+            var agentid = parseInt(req.query.meshcmd);
+            if ((agentid < 10000) && (obj.parent.meshAgentBinaries[agentid + 10000] != null)) { agentid += 10000; } // Avoid merging javascript to a signed mesh agent.
+            var argentInfo = obj.parent.meshAgentBinaries[agentid];
             if ((argentInfo == null) || (obj.parent.defaultMeshCmd == null)) { res.sendStatus(404); return; }
             res.set({ 'Cache-Control': 'no-cache, no-store, must-revalidate', 'Pragma': 'no-cache', 'Expires': '0', 'Content-Type': 'application/octet-stream', 'Content-Disposition': 'attachment; filename=meshcmd' + ((req.query.meshcmd <= 4) ? '.exe' : '') });
             res.statusCode = 200;
-            obj.parent.exeHandler.streamExeWithJavaScript({ platform: argentInfo.platform, sourceFileName: argentInfo.path, destinationStream: res, js: new Buffer(obj.parent.defaultMeshCmd, 'utf8'), peinfo: argentInfo.pe });
+            if (argentInfo.signedMeshCmdPath != null) {
+                // If we hav a pre-signed MeshCmd, send that.
+                res.sendFile(argentInfo.signedMeshCmdPath);
+            } else {
+                // Merge JavaScript to a unsigned agent and send that.
+                obj.parent.exeHandler.streamExeWithJavaScript({ platform: argentInfo.platform, sourceFileName: argentInfo.path, destinationStream: res, js: new Buffer(obj.parent.defaultMeshCmd, 'utf8'), peinfo: argentInfo.pe });
+            }
         } else if (req.query.meshaction != null) {
             var domain = checkUserIpAddress(req, res);
             if (domain == null) { res.sendStatus(404); return; }
@@ -1480,7 +1493,8 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
                         debugLevel: 0
                     }
                     if (user != null) { meshaction.username = user.name; }
-                    if (obj.args.lanonly != true) { meshaction.serverUrl = ((obj.args.notls == true) ? 'ws://' : 'wss://') + getWebServerName(domain) + ':' + obj.args.port + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; }
+                    var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
+                    if (obj.args.lanonly != true) { meshaction.serverUrl = ((obj.args.notls == true) ? 'ws://' : 'wss://') + getWebServerName(domain) + ':' + httpsPort + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; }
                     res.set({ 'Cache-Control': 'no-cache, no-store, must-revalidate', 'Pragma': 'no-cache', 'Expires': '0', 'Content-Type': 'text/plain', 'Content-Disposition': 'attachment; filename=meshaction.txt' });
                     res.send(JSON.stringify(meshaction, null, ' '));
                 });
@@ -1494,7 +1508,8 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
                     debugLevel: 0
                 }
                 if (user != null) { meshaction.username = user.name; }
-                if (obj.args.lanonly != true) { meshaction.serverUrl = ((obj.args.notls == true) ? 'ws://' : 'wss://') + getWebServerName(domain) + ':' + obj.args.port + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; }
+                var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
+                if (obj.args.lanonly != true) { meshaction.serverUrl = ((obj.args.notls == true) ? 'ws://' : 'wss://') + getWebServerName(domain) + ':' + httpsPort + '/' + ((domain.id == '') ? '' : ('/' + domain.id)) + 'meshrelay.ashx'; }
                 res.set({ 'Cache-Control': 'no-cache, no-store, must-revalidate', 'Pragma': 'no-cache', 'Expires': '0', 'Content-Type': 'text/plain', 'Content-Disposition': 'attachment; filename=meshaction.txt' });
                 res.send(JSON.stringify(meshaction, null, ' '));
             } else {
@@ -1550,7 +1565,8 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
             var xdomain = (domain.dns == null) ? domain.id : '';
             if (xdomain != '') xdomain += "/";
             var meshsettings = "MeshName=" + mesh.name + "\r\nMeshType=" + mesh.mtype + "\r\nMeshID=0x" + meshidhex + "\r\nServerID=" + serveridhex + "\r\n";
-            if (obj.args.lanonly != true) { meshsettings += "MeshServer=ws" + (obj.args.notls ? '' : 's') + "://" + getWebServerName(domain) + ":" + obj.args.port + "/" + xdomain + "agent.ashx\r\n"; } else { meshsettings += "MeshServer=local"; }
+            var httpsPort = ((obj.args.aliasport == null) ? obj.args.port : obj.args.aliasport); // Use HTTPS alias port is specified
+            if (obj.args.lanonly != true) { meshsettings += "MeshServer=ws" + (obj.args.notls ? '' : 's') + "://" + getWebServerName(domain) + ":" + httpsPort + "/" + xdomain + "agent.ashx\r\n"; } else { meshsettings += "MeshServer=local"; }
 
             res.set({ 'Cache-Control': 'no-cache, no-store, must-revalidate', 'Pragma': 'no-cache', 'Expires': '0', 'Content-Type': 'application/octet-stream', 'Content-Disposition': 'attachment; filename=meshagent.msh' });
             res.send(meshsettings);
@@ -1643,12 +1659,12 @@ module.exports.CreateWebServer = function (parent, db, args, secret, certificate
         obj.args.port = port;
         if (obj.tlsServer != null) {
             if (obj.args.lanonly == true) {
-                obj.tcpServer = obj.tlsServer.listen(port, function () { console.log('MeshCentral HTTPS web server running on port ' + port + '.'); });
+                obj.tcpServer = obj.tlsServer.listen(port, function () { console.log('MeshCentral HTTPS web server running on port ' + port + ((args.aliasport != null) ? (', alias port ' + args.aliasport) : '') + '.'); });
             } else {
-                obj.tcpServer = obj.tlsServer.listen(port, function () { console.log('MeshCentral HTTPS web server running on ' + certificates.CommonName + ':' + port + '.'); });
+                obj.tcpServer = obj.tlsServer.listen(port, function () { console.log('MeshCentral HTTPS web server running on ' + certificates.CommonName + ':' + port + ((args.aliasport != null) ? (', alias port ' + args.aliasport) : '') + '.'); });
             }
         } else {
-            obj.tcpServer = obj.app.listen(port, function () { console.log('MeshCentral HTTP web server running on port ' + port + '.'); });
+            obj.tcpServer = obj.app.listen(port, function () { console.log('MeshCentral HTTP web server running on port ' + port + ((args.aliasport != null) ? (', alias port ' + args.aliasport) : '') + '.'); });
         }
     }