diff --git a/MeshCentralServer.njsproj b/MeshCentralServer.njsproj
index dc3e18c8..395682c9 100644
--- a/MeshCentralServer.njsproj
+++ b/MeshCentralServer.njsproj
@@ -31,6 +31,8 @@
     <Compile Include="agents\modules_meshcmd\amt-xml.js" />
     <Compile Include="agents\modules_meshcmd\amt.js" />
     <Compile Include="agents\modules_meshcmd\process-manager.js" />
+    <Compile Include="agents\modules_meshcmd\service-host.js" />
+    <Compile Include="agents\modules_meshcmd\service-manager.js" />
     <Compile Include="agents\modules_meshcmd\smbios.js" />
     <Compile Include="agents\modules_meshcmd\user-sessions.js" />
     <Compile Include="agents\modules_meshcore\amt-lme.js" />
diff --git a/agents/modules_meshcmd/promise.js b/agents/modules_meshcmd/promise.js
deleted file mode 100644
index 227b23ac..00000000
--- a/agents/modules_meshcmd/promise.js
+++ /dev/null
@@ -1,207 +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 refTable = {};
-
-function event_switcher_helper(desired_callee, target)
-{
-    this._ObjectID = 'event_switcher';
-    this.func = function func()
-    {
-        var args = [];
-        for(var i in arguments)
-        {
-            args.push(arguments[i]);
-        }
-        return (func.target.apply(func.desired, args));
-    };
-    this.func.desired = desired_callee;
-    this.func.target = target;
-    this.func.self = this;
-}
-function event_switcher(desired_callee, target)
-{
-    return (new event_switcher_helper(desired_callee, target));
-}
-
-function Promise(promiseFunc)
-{
-    this._ObjectID = 'promise';
-    this.promise = this;
-    this._internal = { _ObjectID: 'promise.internal', promise: this, func: promiseFunc, completed: false, errors: false, completedArgs: [] };
-    require('events').EventEmitter.call(this._internal);
-    this._internal.on('_eventHook', function (eventName, eventCallback)
-    {
-        //console.log('hook', eventName, 'errors/' + this.errors + ' completed/' + this.completed);
-        var r = null;
-
-        if (eventName == 'resolved' && !this.errors && this.completed)
-        {
-            r = eventCallback.apply(this, this.completedArgs);
-            if(r!=null)
-            {
-                this.emit_returnValue('resolved', r);
-            }
-        }
-        if (eventName == 'rejected' && this.errors && this.completed)
-        {
-            eventCallback.apply(this, this.completedArgs);
-        }
-        if (eventName == 'settled' && this.completed)
-        {
-            eventCallback.apply(this, []);
-        }
-    });
-    this._internal.resolver = function _resolver()
-    {
-        _resolver._self.errors = false;
-        _resolver._self.completed = true;
-        _resolver._self.completedArgs = [];
-        var args = ['resolved'];
-        if (this.emit_returnValue && this.emit_returnValue('resolved') != null)
-        {
-            _resolver._self.completedArgs.push(this.emit_returnValue('resolved'));
-            args.push(this.emit_returnValue('resolved'));
-        }
-        else
-        {
-            for (var a in arguments)
-            {
-                _resolver._self.completedArgs.push(arguments[a]);
-                args.push(arguments[a]);
-            }
-        }
-        _resolver._self.emit.apply(_resolver._self, args);
-        _resolver._self.emit('settled');
-    };
-    this._internal.rejector = function _rejector()
-    {
-        _rejector._self.errors = true;
-        _rejector._self.completed = true;
-        _rejector._self.completedArgs = [];
-        var args = ['rejected'];
-        for (var a in arguments)
-        {
-            _rejector._self.completedArgs.push(arguments[a]);
-            args.push(arguments[a]);
-        }
-
-        _rejector._self.emit.apply(_rejector._self, args);
-        _rejector._self.emit('settled');
-    };
-    this.catch = function(func)
-    {
-        this._internal.once('rejected', event_switcher(this, func).func);
-    }
-    this.finally = function (func)
-    {
-        this._internal.once('settled', event_switcher(this, func).func);
-    };
-    this.then = function (resolved, rejected)
-    {
-        if (resolved) { this._internal.once('resolved', event_switcher(this, resolved).func); }
-        if (rejected) { this._internal.once('rejected', event_switcher(this, rejected).func); }
-
-        var retVal = new Promise(function (r, j) { });
-        this._internal.once('resolved', retVal._internal.resolver);
-        this._internal.once('rejected', retVal._internal.rejector);
-        retVal.parentPromise = this;
-        return (retVal);
-    };
-
-    this._internal.resolver._self = this._internal;
-    this._internal.rejector._self = this._internal;;
-
-    try
-    {
-        promiseFunc.call(this, this._internal.resolver, this._internal.rejector);
-    }
-    catch(e)
-    {
-        this._internal.errors = true;
-        this._internal.completed = true;
-        this._internal.completedArgs = [e];
-        this._internal.emit('rejected', e);
-        this._internal.emit('settled');
-    }
-
-    if(!this._internal.completed)
-    {
-        // Save reference of this object
-        refTable[this._internal._hashCode()] = this._internal;
-        this._internal.once('settled', function () { refTable[this._hashCode()] = null; });
-    }
-}
-
-Promise.resolve = function resolve()
-{
-    var retVal = new Promise(function (r, j) { });
-    var args = [];
-    for (var i in arguments)
-    {
-        args.push(arguments[i]);
-    }
-    retVal._internal.resolver.apply(retVal._internal, args);
-    return (retVal);
-};
-Promise.reject = function reject() {
-    var retVal = new Promise(function (r, j) { });
-    var args = [];
-    for (var i in arguments) {
-        args.push(arguments[i]);
-    }
-    retVal._internal.rejector.apply(retVal._internal, args);
-    return (retVal);
-};
-Promise.all = function all(promiseList)
-{
-    var ret = new Promise(function (res, rej)
-    {
-        this.__rejector = rej;
-        this.__resolver = res;
-        this.__promiseList = promiseList;
-        this.__done = false;
-        this.__count = 0;
-    });
-
-    for (var i in promiseList)
-    {
-        promiseList[i].then(function ()
-        {
-            // Success
-            if(++ret.__count == ret.__promiseList.length)
-            {
-                ret.__done = true;
-                ret.__resolver(ret.__promiseList);
-            }
-        }, function (arg)
-        {
-            // Failure
-            if(!ret.__done)
-            {
-                ret.__done = true;
-                ret.__rejector(arg);
-            }
-        });
-    }
-    if (promiseList.length == 0)
-    {
-        ret.__resolver(promiseList);
-    }
-    return (ret);
-};
-
-module.exports = Promise;
\ No newline at end of file
diff --git a/agents/modules_meshcore/win-terminal.js b/agents/modules_meshcore/win-terminal.js
index 541c6954..64319702 100644
--- a/agents/modules_meshcore/win-terminal.js
+++ b/agents/modules_meshcore/win-terminal.js
@@ -249,7 +249,7 @@ function windows_terminal() {
                     break;
                 case EVENT_CONSOLE_UPDATE_SIMPLE:
                     //console.log('UPDATE SIMPLE: [X: ' + LOWORD(idObject.Val) + ' Y: ' + HIWORD(idObject.Val) + ' Char: ' + LOWORD(idChild.Val) + ' Attr: ' + HIWORD(idChild.Val) + ']');
-                    var simplebuffer = { data: [Buffer.alloc(1, LOWORD(idChild.Val))], attributes: [HIWORD(idChild.Val)], width: 1, height: 1, x: LOWORD(idObject.Val) + 1, y: HIWORD(idObject.Val) };
+                    var simplebuffer = { data: [ Buffer.alloc(1, LOWORD(idChild.Val)) ], attributes: [ HIWORD(idChild.Val) ], width: 1, height: 1, x: LOWORD(idObject.Val), y: HIWORD(idObject.Val) };
                     this.terminal._SendDataBuffer(simplebuffer);
                     break;
                 case EVENT_CONSOLE_UPDATE_SCROLL:
@@ -330,8 +330,8 @@ function windows_terminal() {
     }
     this._WriteCharacter = function (key, bControlKey) {
         var rec = GM.CreateVariable(20);
-        rec.Deref(0, 2).toBuffer().writeUInt16LE(KEY_EVENT);                                 // rec.EventType 
-        rec.Deref(4, 4).toBuffer().writeUInt16LE(1);                                         // rec.Event.KeyEvent.bKeyDown
+        rec.Deref(0, 2).toBuffer().writeUInt16LE(KEY_EVENT);                                // rec.EventType 
+        rec.Deref(4, 4).toBuffer().writeUInt16LE(1);                                        // rec.Event.KeyEvent.bKeyDown
         rec.Deref(16, 4).toBuffer().writeUInt32LE(bControlKey);                             // rec.Event.KeyEvent.dwControlKeyState
         rec.Deref(14, 1).toBuffer()[0] = key;                                               // rec.Event.KeyEvent.uChar.AsciiChar
         rec.Deref(8, 2).toBuffer().writeUInt16LE(1);                                        // rec.Event.KeyEvent.wRepeatCount
@@ -345,9 +345,8 @@ function windows_terminal() {
         return (this._kernel32.WriteConsoleInputA(this._stdinput, rec, 1, dwWritten).Val != 0);
     }
     
+    // Get the current visible screen buffer
     this._GetScreenBuffer = function (sx, sy, ex, ey) {
-        // get the current visible screen buffer
-        
         var info = GM.CreateVariable(22);
         if (this._kernel32.GetConsoleScreenBufferInfo(this._stdoutput, info).Val == 0) { throw ('Error getting screen buffer info'); }
         
@@ -366,7 +365,6 @@ function windows_terminal() {
             this._scrx = this._scry = 0;
         }
         
-        
         var nBuffer = GM.CreateVariable((ex - sx + 1) * (ey - sy + 1) * 4);
         var size = GM.CreateVariable(4);
         size.Deref(0, 2).toBuffer().writeUInt16LE(ex - sx + 1, 0);
@@ -418,7 +416,7 @@ function windows_terminal() {
             
             //line = data.data.slice(data.width * dy, (data.width * dy) + data.width);
             //attr = data.attributes.slice(data.width * dy, (data.width * dy) + data.width);
-            this._stream.push(TranslateLine(data.x, data.y + dy + 1, line, attr));
+            this._stream.push(TranslateLine(data.x + 1, data.y + dy + 1, line, attr));
         }
     }
 
diff --git a/package.json b/package.json
index 125ebc3a..88b86ad3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.2.4-p",
+  "version": "0.2.4-q",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/public/messenger.htm b/public/messenger.htm
index 3ed66a14..4a39e3f0 100644
--- a/public/messenger.htm
+++ b/public/messenger.htm
@@ -16,14 +16,18 @@
         <div id="xbottom" style="position:absolute;left:0;right:0;bottom:0px;height:30px;background-color:#036">
             <div style="position:absolute;left:5px;right:215px;bottom:4px;top:4px;background-color:aliceblue"><input id="xouttext" type="text" style="width:calc(100% - 5px)" onfocus=onUserInputFocus(1) onblur=onUserInputFocus(0) /></div>
             <input type="button" id="sendButton" value="Send" style="position:absolute;right:110px;width:100px;top:4px;" onclick="xsend(event)" />
-            <input type="button" id="clearButton" value="Clear" style="position:absolute;right:5px;width:100px;top:4px;" onclick="xclear(event)" />
+            <input type="button" id="clearButton" value="Clear" style="position:absolute;right:5px;width:100px;top:4px;" onclick="displayClear()" />
         </div>
         <script type="text/javascript">
             var userInputFocus = 0;
             var controlsEnabled = true;
             var args = parseUriArgs();
-            var socket = null;
-            var state = 0;
+            var socket = null;              // Websocket object
+            var state = 0;                  // Connection state. 0 = Disconnected, 1 = Connecting, 2 = Connected.
+            var random = Math.random();     // Selected random, larger value initiates WebRTC.
+            var webrtc = null;              // Main WebRTC object
+            var webchannel = null;          // WebRTC data channel
+            var webrtcconfiguration = null; //{ "iceServers": [ { 'urls': 'stun:stun.services.mozilla.com' }, { 'urls': 'stun:stun.l.google.com:19302' } ] };
 
             // Set the title
             if (args.title) { QH('xtitle', ' - ' + args.title); document.title = document.title + ' - ' + args.title; }
@@ -47,60 +51,155 @@
             }
 
             function onUserInputFocus(x) { userInputFocus = x; }
-            function xclear(event) { QH('xmsg', ''); }
-            function xcontrol(msg) {
+            function displayClear() { QH('xmsg', ''); }
+
+            // Display a control message
+            function displayControl(msg) {
                 QA('xmsg', '<div style="clear:both"><div style="color:gray;float:left;margin-bottom:2px">' + msg + '</div><div></div></div>');
                 Q('xmsg').scrollTop = Q('xmsg').scrollHeight;
             }
-            function xrecv(msg) {
+
+            // Display a message from the remote user
+            function displayRemote(msg) {
                 QA('xmsg', '<div style="clear:both"><div style="background-color:#00cc99;color:black;border-radius:5px;padding:5px;float:left;margin-bottom:5px;margin-right:20px">' + msg + '</div><div></div></div>');
                 Q('xmsg').scrollTop = Q('xmsg').scrollHeight;
             }
 
+            // Display and send a message from the local user
             function xsend(event) {
                 var outtext = Q('xouttext').value;
                 if (outtext.length > 0) {
                     Q('xouttext').value = '';
                     QA('xmsg', '<div style="clear:both"><div style="background-color:#0099ff;color:black;border-radius:5px;padding:5px;float:right;margin-bottom:5px;margin-left:20px">' + outtext + '</div><div></div></div>');
                     Q('xmsg').scrollTop = Q('xmsg').scrollHeight;
-                    socket.send(JSON.stringify({ action: 'chat', msg: outtext }));
+                    send({ action: 'chat', msg: outtext });
                 }
             }
 
-            function enableControls(lock) {
-                controlsEnabled = lock;
-                QE('sendButton', lock);
-                QE('clearButton', lock);
-                QE('xouttext', lock);
-            }
-
+            // Enable user controls
+            function enableControls(lock) { controlsEnabled = lock; QE('sendButton', lock); QE('clearButton', lock); QE('xouttext', lock); }
             function haltEvent(e) { if (e.preventDefault) e.preventDefault(); if (e.stopPropagation) e.stopPropagation(); return false; }
             function parseUriArgs() { var name, r = {}, parsedUri = window.document.location.href.split(/[\?&|\=]/); parsedUri.splice(0, 1); for (x in parsedUri) { switch (x % 2) { case 0: { name = parsedUri[x]; break; } case 1: { r[name] = parsedUri[x]; var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } break; } } } return r; }
 
+            // This is the WebRTC setup
+            function startWebRTC(description) {
+                // Setup the WebRTC object
+                if (webrtc == null) {
+                    if (typeof RTCPeerConnection !== 'undefined') { webrtc = new RTCPeerConnection(webrtcconfiguration); }
+                    else if (typeof webkitRTCPeerConnection !== 'undefined') { webrtc = new webkitRTCPeerConnection(webrtcconfiguration); }
+                    if (webrtc == null) return;
+                    webrtc.onicecandidate = function (e) { try { if (e.candidate != null) { sendws({ action: 'webRtcIce', ice: e.candidate }); } } catch (ex) { } }
+                    webrtc.oniceconnectionstatechange = function () { if (webrtc && webrtc.iceConnectionState == 'failed') { closeWebRTC(); } }
+                    webrtc.ondatachannel = function (ev) {
+                        webchannel = ev.channel;
+                        webchannel.onmessage = function (event) { processMessage(event.data, 2); };
+                        webchannel.onopen = function () { webchannel.ok = true; sendws({ action: 'rtcSwitch', v: 0 }); };
+                        webchannel.onclose = function (event) { if (webchannel && webchannel.ok) { disconnect(); } else { closeWebRTC(); } }
+                    }
+                }
+
+                // Initiate the WebRTC offer or handle the offer from the peer.
+                if (description == null) {
+                    webchannel = webrtc.createDataChannel("DataChannel", {}); // { ordered: false, maxRetransmits: 2 }
+                    webchannel.onmessage = function (event) { processMessage(event.data, 2); };
+                    webchannel.onopen = function () { webchannel.ok = true; sendws({ action: 'rtcSwitch', v: 0 }); };
+                    webchannel.onclose = function (event) { if (webchannel && webchannel.ok) { disconnect(); } else { closeWebRTC(); } }
+                    webrtc.createOffer(function (offer) {
+                        webrtc.setLocalDescription(offer, function () { try { sendws({ action: 'webRtcSdp', sdp: offer }); } catch (ex) { } }, closeWebRTC);
+                    }, closeWebRTC, { mandatory: { OfferToReceiveAudio: false, OfferToReceiveVideo: false } });
+                } else {
+                    webrtc.setRemoteDescription(new RTCSessionDescription(description), function () {
+                        if (description.type == 'offer') {
+                            webrtc.createAnswer(function (answer) {
+                                webrtc.setLocalDescription(answer, function () { try { sendws({ action: 'webRtcSdp', sdp: answer }); } catch (ex) { } }, closeWebRTC);
+                            }, closeWebRTC);
+                        }
+                    }, closeWebRTC);
+                }
+            }
+
+            // Indicate to peer that data traffic will no longer be sent over websocket and start holding traffic.
+            function performWebRtcSwitch() {
+                if (webchannel && webchannel.ok) { sendws({ action: 'rtcSwitch', v: 1 }); webchannel.xoutBuffer = []; }
+            }
+
+            // Close the WebRTC connection, should be called if a problem occurs during WebRTC setup.
+            function closeWebRTC() {
+                if (webchannel != null) { try { webchannel.close(); } catch (e) { } webchannel = null; }
+                if (webrtc != null) { try { webrtc.close(); } catch (e) { } webrtc = null; }
+            }
+
+            // Disconnect everything
+            function disconnect() {
+                enableControls(false);
+                closeWebRTC();
+                if (socket != null) { socket.close(); socket = null; }
+                if (state > 0) { displayControl('Connection closed.'); }
+                if (state > 1) { setTimeout(start, 500); }
+                state = 0;
+            }
+
+            // Send data over the current transport (WebRTC first)
+            function send(data) {
+                if (state != 2) return; // If not in connected state, ignore this.
+                if (typeof data == 'object') { data = JSON.stringify(data); } // If this is an object, convert it to a string.
+                if (webchannel && webchannel.ok) { if (webchannel.xoutBuffer != null) { webchannel.xoutBuffer.push(data); } else { webchannel.send(data); } } // If WebRTC channel is possible, use it or hold until we can use it.
+                else { if (socket != null) { socket.send(data); } } // If a websocket channel is present, use that.
+            }
+
+            // Send data over the websocket transport (WebSocket only)
+            function sendws(data) {
+                if (state != 2) return;
+                if (typeof data == 'object') { data = JSON.stringify(data); }
+                if (socket != null) { socket.send(data); }
+            }
+
+            // Process incoming messages
+            function processMessage(data, transport) {
+                if (typeof data == 'string') {
+                    try { data = JSON.parse(data); } catch (ex) { console.log('Unable to parse', data); return; }
+                    switch (data.action) {
+                        case 'chat': { displayRemote(data.msg); break; } // Incoming chat message.
+                        case 'random': { if (random > data.random) { startWebRTC(); } break; } // If we have a larger random value, we start WebRTC.
+                        case 'webRtcSdp': { startWebRTC(data.sdp); break; } // Remote WebRTC offer or answer.
+                        case 'webRtcIce': { if (webrtc) { webrtc.addIceCandidate(new RTCIceCandidate(data.ice)); } break; } // Remote ICE candidate
+                        case 'rtcSwitch': { // WebRTC switch over commands.
+                            switch (data.v) {
+                                case 0: { performWebRtcSwitch(); break; } // Other side is ready for switch over to WebRTC
+                                case 1: { sendws({ action: 'rtcSwitch', v: 2 }); break; } // Other side no longer sending data on websocket, confirm we got the end marker
+                                case 2: { for (var i in webchannel.xoutBuffer) { webchannel.send(webchannel.xoutBuffer[i]); } delete webchannel.xoutBuffer; break; } // Send any pending data over WebRTC and start using WebRTC with all traffic
+                            }
+                            break;
+                        }
+                        default: { console.log('Unhandled object data', data); break; }
+                    }
+                } else {
+                    console.log('Unhandled data', typeof data, data);
+                }
+            }
+
+            // This is the main start
             function start() {
                 // Get started
                 enableControls(false);
                 if ((typeof args.id == 'string') && (args.id.length > 0)) {
-                    //xcontrol('Connecting...');
                     socket = new WebSocket(window.location.protocol.replace("http", "ws") + "//" + window.location.host + window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/')) + '/meshrelay.ashx?id=' + args.id);
-                    socket.onopen = function () { state = 1; xcontrol('Waiting for other user...'); }
+                    socket.onopen = function () { state = 1; displayControl('Waiting for other user...'); }
                     socket.onerror = function (e) { console.error(e); }
-                    socket.onclose = function () { enableControls(false); if (state > 0) { xcontrol('Connection closed.'); } socket = null; if (state > 1) { setTimeout(start, 500); } state = 0; }
+                    socket.onclose = function () { disconnect(); }
                     socket.onmessage = function (msg) {
-                        if ((state < 2) && (typeof msg.data == 'string')) { enableControls(true); xcontrol('Connected.'); state = 2; return; }
-                        if (state == 2) {
-                            if (typeof msg.data == 'string') {
-                                var obj = JSON.parse(msg.data);
-                                switch (obj.action) {
-                                    case 'chat': { xrecv(obj.msg); break; }
-                                }
-                            } else {
-                                //xrecv(JSON.stringify(msg));
-                            }
+                        if ((state < 2) && (typeof msg.data == 'string')) {
+                            enableControls(true);
+                            closeWebRTC();
+                            displayControl('Connected.');
+                            state = 2;
+                            sendws({ action: 'random', random: random }); // Send a random number. Higher number starts the WebRTC session.
+                            return;
                         }
+                        if (state == 2) { processMessage(msg.data, 1); }
                     }
                 } else {
-                    xcontrol('Error: No connection key specified.');
+                    displayControl('Error: No connection key specified.');
                 }
             }