diff --git a/modules/service-host.js b/modules/service-host.js
index fabc4e8..8b40142 100644
--- a/modules/service-host.js
+++ b/modules/service-host.js
@@ -170,8 +170,6 @@ function serviceHost(serviceName)
     
     this.run = function run()
     {
-        var serviceOperation = 0;
-
         for(var i = 0; i<process.argv.length; ++i)
         {
             switch(process.argv[i])
@@ -202,14 +200,9 @@ function serviceHost(serviceName)
                         console.log(e);
                         process.exit();
                     }
-                    if (process.platform == 'win32' || process.platform == 'darwin')
-                    {
-                        // Only do this on Windows/MacOS, becuase Linux is async... It'll complete later
-                        console.log(this._ServiceOptions.name + ' uninstalled');
-                        process.exit();
-                    }
-                    i = process.argv.length;
-                    serviceOperation = 1;
+
+                    console.log(this._ServiceOptions.name + ' uninstalled');
+                    process.exit();
                     break;
                 case 'start':
                 case '-d':
@@ -249,109 +242,35 @@ function serviceHost(serviceName)
         else if (process.platform == 'linux')
         {
             var moduleName = this._ServiceOptions ? this._ServiceOptions.name : process.execPath.substring(1 + process.execPath.lastIndexOf('/'));
+            var platformType = require('process-manager').getProcessInfo(1).Name;
 
-            for (var i = 0; i < process.argv.length; ++i) {
-                switch (process.argv[i]) {
-                    case 'start':
-                    case '-d':
-                        var child = require('child_process').execFile(process.execPath, [moduleName], { type: require('child_process').SpawnTypes.DETACHED });
-                        var pstream = null;
-                        try {
-                            pstream = require('fs').createWriteStream('/var/run/' + moduleName + '.pid', { flags: 'w' });
-                        }
-                        catch (e) {
-                        }
-                        if (pstream == null) {
-                            pstream = require('fs').createWriteStream('.' + moduleName + '.pid', { flags: 'w' });
-                        }
-                        pstream.end(child.pid.toString());
-
-                        console.log(moduleName + ' started!');
-                        process.exit();
-                        break;
-                    case 'stop':
-                    case '-s':
-                        var pid = null;
-                        try {
-                            pid = parseInt(require('fs').readFileSync('/var/run/' + moduleName + '.pid', { flags: 'r' }));
-                            require('fs').unlinkSync('/var/run/' + moduleName + '.pid');
-                        }
-                        catch (e) {
-                        }
-                        if (pid == null) {
-                            try {
-                                pid = parseInt(require('fs').readFileSync('.' + moduleName + '.pid', { flags: 'r' }));
-                                require('fs').unlinkSync('.' + moduleName + '.pid');
-                            }
-                            catch (e) {
-                            }
-                        }
-
-                        if (pid) {
-                            process.kill(pid);
-                            console.log(moduleName + ' stopped');
-                        }
-                        else {
-                            console.log(moduleName + ' not running');
-                        }
-                        process.exit();
-                        break;
-                }
+            if (platformType != 'systemd' && platformType != 'init')
+            {
+                this.emit('normalStart'); // Unknown Platform Type, so we're probably not a service
             }
-
-            if (serviceOperation == 0) {
-                // This is non-windows, so we need to check how this binary was started to determine if this was a service start
-
-                // Start by checking if we were started with start/stop
-                var pid = null;
-                try {
-                    pid = parseInt(require('fs').readFileSync('/var/run/' + moduleName + '.pid', { flags: 'r' }));
-                }
-                catch (e) {
-                }
-                if (pid == null) {
-                    try {
-                        pid = parseInt(require('fs').readFileSync('.' + moduleName + '.pid', { flags: 'r' }));
-                    }
-                    catch (e) {
-                    }
+            else
+            {
+                this._checkpid = require('child_process').execFile('/bin/sh', ['sh']);
+                this._checkpid.stdout.result = '';
+                this._checkpid.stdout.on('data', function (chunk) { this.result += chunk.toString(); });
+                switch(platformType)
+                {
+                    case 'init':
+                        this._checkpid.stdin.write('service ' + moduleName + " status | awk '{print $4}'\nexit\n");
+                        break;
+                    case 'systemd':
+                        this._checkpid.stdin.write('systemctl status ' + moduleName + " | grep 'Main PID:' | awk '{print $3}'\nexit\n");
+                        break;
                 }
+                this._checkpid.waitExit();
 
-                if (pid != null && pid == process.pid) {
+                if(this._checkpid.stdout.result != '' && parseInt(this._checkpid.stdout.result) == process.pid)
+                {
                     this.emit('serviceStart');
                 }
-                else {
-                    // Now we need to check if we were started with systemd
-                    if (require('process-manager').getProcessInfo(1).Name == 'systemd') {
-                        this._checkpid = require('child_process').execFile('/bin/sh', ['sh'], { type: require('child_process').SpawnTypes.TERM });
-                        this._checkpid.result = '';
-                        this._checkpid.parent = this;
-                        this._checkpid.on('exit', function onCheckPIDExit() {
-                            var lines = this.result.split('\r\n');
-                            for (i in lines) {
-                                if (lines[i].startsWith(' Main PID:')) {
-                                    var tokens = lines[i].split(' ');
-                                    if (parseInt(tokens[3]) == process.pid) {
-                                        this.parent.emit('serviceStart');
-                                    }
-                                    else {
-                                        this.parent.emit('normalStart');
-                                    }
-                                    delete this.parent._checkpid;
-                                    return;
-                                }
-                            }
-                            this.parent.emit('normalStart');
-                            delete this.parent._checkpid;
-                        });
-                        this._checkpid.stdout.on('data', function (chunk) { this.parent.result += chunk.toString(); });
-                        this._checkpid.stdin.write("systemctl status " + moduleName + " | grep 'Main PID:'\n");
-                        this._checkpid.stdin.write('exit\n');
-                    }
-                    else {
-                        // This isn't even a systemd platform, so this couldn't have been a service start
-                        this.emit('normalStart');
-                    }
+                else
+                {
+                    this.emit('normalStart');
                 }
             }
         }
diff --git a/modules/service-manager.js b/modules/service-manager.js
index 168fc96..bbebce7 100644
--- a/modules/service-manager.js
+++ b/modules/service-manager.js
@@ -14,6 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+
+function extractFileName(filePath)
+{
+    var tokens = filePath.split('\\').join('/').split('/');
+    var name;
+
+    while ((name = tokens.pop()) == '');
+    return (name);
+}
+
 function parseServiceStatus(token)
 {
     var j = {};
@@ -230,8 +240,8 @@ function serviceManager()
             // Before we start, we need to copy the binary to the right place
             var folder = this.getServiceFolder();
             if (!require('fs').existsSync(folder)) { require('fs').mkdirSync(folder); }
-            require('fs').copyFileSync(options.servicePath, folder + '\\' + options.name + '.exe');
-            options.servicePath = folder + '\\' + options.name + '.exe';
+            require('fs').copyFileSync(options.servicePath, folder + '\\' + options.name + '\\' + options.name + '.exe');
+            options.servicePath = folder + '\\' + options.name + '\\' + options.name + '.exe';
 
             var servicePath = this.GM.CreateVariable('"' + options.servicePath + '"');
             var handle = this.proxy.OpenSCManagerA(0x00, 0x00, 0x0002);
@@ -276,39 +286,81 @@ function serviceManager()
             }
             this.proxy.CloseServiceHandle(h);
             this.proxy.CloseServiceHandle(handle);
+
+            if (options.files)
+            {
+                for(var i in options.files)
+                {
+                    console.log('copying ' + options.files[i]);
+                    require('fs').copyFileSync(options.files[i], folder + '\\' + options.name + '\\' + extractFileName(options.files[i]));
+                }
+            }
+
             return (this.getService(options.name));
         }
         if(process.platform == 'linux')
         {
-            if (!this.isAdmin()) { throw ('Installing as Service, requires root'); }
-
+            if (!this.isAdmin()) { console.log('Installing a Service requires root'); throw ('Installing as Service, requires root'); }
+            var parameters = options.parameters ? options.parameters.join(' ') : '';
+            var conf;
             switch (this.getServiceType())
             {
                 case 'init':
-                    require('fs').copyFileSync(options.servicePath, '/etc/init.d/' + options.name);
-                    console.log('copying ' + options.servicePath);
-                    var m = require('fs').statSync('/etc/init.d/' + options.name).mode;
-                    m |= (require('fs').CHMOD_MODES.S_IXUSR | require('fs').CHMOD_MODES.S_IXGRP);
-                    require('fs').chmodSync('/etc/init.d/' + options.name, m);
-                    this._update = require('child_process').execFile('/bin/sh', ['sh'], { type: require('child_process').SpawnTypes.TERM });
-                    this._update._moduleName = options.name;
-                    this._update.stdout.on('data', function (chunk) { });
-                    this._update.stdin.write('update-rc.d ' + options.name + ' defaults\n');
-                    this._update.stdin.write('exit\n');
-                    //update-rc.d meshagent defaults # creates symlinks for rc.d
-                    //service meshagent start
+                    if (!require('fs').existsSync('/usr/local/mesh_services/')) { require('fs').mkdirSync('/usr/local/mesh_services'); }
+                    if (!require('fs').existsSync('/usr/local/mesh_services/' + options.name)) { require('fs').mkdirSync('/usr/local/mesh_services/' + options.name); }
 
-                    this._update.waitExit();
+                    require('fs').copyFileSync(options.servicePath, '/usr/local/mesh_services/' + options.name + '/' + options.name);
+                    console.log('copying ' + options.servicePath);
+
+                    var m = require('fs').statSync('/usr/local/mesh_services/' + options.name + '/' + options.name).mode;
+                    m |= (require('fs').CHMOD_MODES.S_IXUSR | require('fs').CHMOD_MODES.S_IXGRP);
+                    require('fs').chmodSync('/usr/local/mesh_services/' + options.name + '/' + options.name, m);
+
+                    conf = require('fs').createWriteStream('/etc/init/' + options.name + '.conf', {flags: 'wb'});
+                    conf.write('start on runlevel [2345]\n');
+                    conf.write('stop on runlevel [016]\n\n');
+                    conf.write('respawn\n\n');
+                    conf.write('chdir /usr/local/mesh_services/' + options.name + '\n');
+                    conf.write('exec /usr/local/mesh_services/' + options.name + '/' + options.name + ' ' + parameters + '\n\n');
+                    conf.end();
 
                     break;
                 case 'systemd':
                     var serviceDescription = options.description ? options.description : 'MeshCentral Agent';
-                    if (!require('fs').existsSync('/usr/local/mesh')) { require('fs').mkdirSync('/usr/local/mesh'); }
-                    require('fs').copyFileSync(options.servicePath, '/usr/local/mesh/' + options.name);
-                    var m = require('fs').statSync('/usr/local/mesh/' + options.name).mode;
+
+                    if (!require('fs').existsSync('/usr/local/mesh_services/')) { require('fs').mkdirSync('/usr/local/mesh_services'); }
+                    if (!require('fs').existsSync('/usr/local/mesh_services/' + options.name)) { require('fs').mkdirSync('/usr/local/mesh_services/' + options.name); }
+
+                    console.log('copying ' + options.servicePath);
+                    require('fs').copyFileSync(options.servicePath, '/usr/local/mesh_services/' + options.name + '/' + options.name);
+
+                    var m = require('fs').statSync('/usr/local/mesh_services/' + options.name + '/' + options.name).mode;
                     m |= (require('fs').CHMOD_MODES.S_IXUSR | require('fs').CHMOD_MODES.S_IXGRP);
-                    require('fs').chmodSync('/usr/local/mesh/' + options.name, m);
-                    require('fs').writeFileSync('/lib/systemd/system/' + options.name + '.service', '[Unit]\nDescription=' + serviceDescription + '\n[Service]\nExecStart=/usr/local/mesh/' + options.name + '\nStandardOutput=null\nRestart=always\nRestartSec=3\n[Install]\nWantedBy=multi-user.target\nAlias=' + options.name + '.service\n', { flags: 'w' });
+                    require('fs').chmodSync('/usr/local/mesh_services/' + options.name + '/' + options.name, m);
+
+                    if (require('fs').existsSync('/lib/systemd/system'))
+                    {
+                        conf = require('fs').createWriteStream('/lib/systemd/system/' + options.name + '.service', { flags: 'wb' });
+                    }
+                    else if (require('fs').existsSync('/usr/lib/systemd/system'))
+                    {
+                        conf = require('fs').createWriteStream('/usr/lib/systemd/system/' + options.name + '.service', { flags: 'wb' });
+                    }
+                    else
+                    {
+                        throw ('unknown location for systemd configuration files');
+                    }
+
+                    conf.write('[Unit]\nDescription=' + serviceDescription + '\n');
+                    conf.write('[Service]\n');
+                    conf.write('WorkingDirectory=/usr/local/mesh_services/' + options.name + '\n');
+                    conf.write('ExecStart=/usr/local/mesh_services/' + options.name + '/' + options.name + ' ' + parameters + '\n');
+                    conf.write('StandardOutput=null\n');
+                    conf.write('Restart=on-failure\n');
+                    conf.write('RestartSec=3\n');
+                    conf.write('[Install]\nWantedBy=multi-user.target\nAlias=' + options.name + '.service\n');
+                    conf.end();
+
                     this._update = require('child_process').execFile('/bin/sh', ['sh'], { type: require('child_process').SpawnTypes.TERM });
                     this._update._moduleName = options.name;
                     this._update.stdout.on('data', function (chunk) { });
@@ -376,6 +428,13 @@ function serviceManager()
                 throw ('Service: ' + options.name + ' already exists');
             }
         }
+
+        if (options.files) {
+            for (var i in options.files) {
+                console.log('copying ' + options.files[i]);
+                require('fs').copyFileSync(options.files[i], '/usr/local/mesh_services/' + options.name + '/' + extractFileName(options.files[i]));
+            }
+        }
     }
     this.uninstallService = function uninstallService(name)
     {
@@ -412,15 +471,15 @@ function serviceManager()
             switch (this.getServiceType())
             {
                 case 'init':
-                    this._update = require('child_process').execFile('/bin/sh', ['sh'], { type: require('child_process').SpawnTypes.TERM });
+                    this._update = require('child_process').execFile('/bin/sh', ['sh']);
                     this._update.stdout.on('data', function (chunk) { });
                     this._update.stdin.write('service ' + name + ' stop\n');
-                    this._update.stdin.write('update-rc.d -f ' + name + ' remove\n');
                     this._update.stdin.write('exit\n');
                     this._update.waitExit();
                     try
                     {
-                        require('fs').unlinkSync('/etc/init.d/' + name);
+                        require('fs').unlinkSync('/etc/init/' + name + '.conf');
+                        require('fs').unlinkSync('/usr/local/mesh_services/' + name + '/' + name);
                         console.log(name + ' uninstalled');
 
                     }
@@ -438,8 +497,9 @@ function serviceManager()
                     this._update.waitExit();
                     try
                     {
-                        require('fs').unlinkSync('/usr/local/mesh/' + name);
-                        require('fs').unlinkSync('/lib/systemd/system/' + name + '.service');
+                        require('fs').unlinkSync('/usr/local/mesh_services/' + name + '/' + name);
+                        if (require('fs').existsSync('/lib/systemd/system/' + name + '.service')) { require('fs').unlinkSync('/lib/systemd/system/' + name + '.service'); }
+                        if (require('fs').existsSync('/usr/lib/systemd/system/' + name + '.service')) { require('fs').unlinkSync('/usr/lib/systemd/system/' + name + '.service'); }
                         console.log(name + ' uninstalled');
                     }
                     catch (e)