diff --git a/red.js b/red.js
index 2cb6c69fc..5cd9fb90d 100644
--- a/red.js
+++ b/red.js
@@ -99,11 +99,14 @@ if (settings.httpRoot === false) {
     settings.httpNodeRoot = false;
 } else {
     settings.httpRoot = settings.httpRoot||"/";
+    settings.disableEditor = settings.disableEditor||false;
 }
 
 if (settings.httpAdminRoot !== false) {
     settings.httpAdminRoot = formatRoot(settings.httpAdminRoot || settings.httpRoot || "/");
     settings.httpAdminAuth = settings.httpAdminAuth || settings.httpAuth;
+} else {
+    settings.disableEditor = true;
 }
 
 if (settings.httpNodeRoot !== false) {
diff --git a/red/comms.js b/red/comms.js
index 519c35d9c..5828c9961 100644
--- a/red/comms.js
+++ b/red/comms.js
@@ -36,55 +36,61 @@ function init(_server,_settings) {
 
 function start() {
 
-    var webSocketKeepAliveTime = settings.webSocketKeepAliveTime || 15000;
-    var path = settings.httpAdminRoot || "/";
-    path = path + (path.slice(-1) == "/" ? "":"/") + "comms";
-    wsServer = new ws.Server({server:server,path:path});
-    
-    wsServer.on('connection',function(ws) {
-        activeConnections.push(ws);
-        ws.on('close',function() {
-            for (var i=0;i<activeConnections.length;i++) {
-                if (activeConnections[i] === ws) {
-                    activeConnections.splice(i,1);
-                    break;
+    if (!settings.disableEditor) {
+        var webSocketKeepAliveTime = settings.webSocketKeepAliveTime || 15000;
+        var path = settings.httpAdminRoot || "/";
+        path = path + (path.slice(-1) == "/" ? "":"/") + "comms";
+        wsServer = new ws.Server({server:server,path:path});
+        
+        wsServer.on('connection',function(ws) {
+            activeConnections.push(ws);
+            ws.on('close',function() {
+                for (var i=0;i<activeConnections.length;i++) {
+                    if (activeConnections[i] === ws) {
+                        activeConnections.splice(i,1);
+                        break;
+                    }
                 }
-            }
+            });
+            ws.on('message', function(data,flags) {
+                var msg = null;
+                try {
+                    msg = JSON.parse(data);
+                } catch(err) {
+                    util.log("[red:comms] received malformed message : "+err.toString());
+                    return;
+                }
+                if (msg.subscribe) {
+                    handleRemoteSubscription(ws,msg.subscribe);
+                }
+            });
+            ws.on('error', function(err) {
+                util.log("[red:comms] error : "+err.toString());
+            });
         });
-        ws.on('message', function(data,flags) {
-            var msg = null;
-            try {
-                msg = JSON.parse(data);
-            } catch(err) {
-                util.log("[red:comms] received malformed message : "+err.toString());
-                return;
-            }
-            if (msg.subscribe) {
-                handleRemoteSubscription(ws,msg.subscribe);
-            }
+        
+        wsServer.on('error', function(err) {
+            util.log("[red:comms] server error : "+err.toString());
         });
-        ws.on('error', function(err) {
-            util.log("[red:comms] error : "+err.toString());
-        });
-    });
-    
-    wsServer.on('error', function(err) {
-        util.log("[red:comms] server error : "+err.toString());
-    });
-     
-    lastSentTime = Date.now();
-    
-    heartbeatTimer = setInterval(function() {
-        var now = Date.now();
-        if (now-lastSentTime > webSocketKeepAliveTime) {
-            publish("hb",lastSentTime);
-        }
-    }, webSocketKeepAliveTime);
+         
+        lastSentTime = Date.now();
+        
+        heartbeatTimer = setInterval(function() {
+            var now = Date.now();
+            if (now-lastSentTime > webSocketKeepAliveTime) {
+                publish("hb",lastSentTime);
+            }
+        }, webSocketKeepAliveTime);
+    }
 }
 
 function stop() {
-    clearInterval(heartbeatTimer);
-    wsServer.close();
+    if (heartbeatTimer) {
+        clearInterval(heartbeatTimer);
+    }
+    if (wsServer) {
+        wsServer.close();
+    }
 }
 
 function publish(topic,data,retain) {
diff --git a/red/server.js b/red/server.js
index 2c5f36270..5ad821581 100644
--- a/red/server.js
+++ b/red/server.js
@@ -22,185 +22,192 @@ var exec = require('child_process').exec;
 var createUI = require("./ui");
 var redNodes = require("./nodes");
 var comms = require("./comms");
+var storage = require("./storage");
 
 var app = null;
 var nodeApp = null;
 var server = null;
 var settings = null;
-var storage = null;
 
 function createServer(_server,_settings) {
     server = _server;
     settings = _settings;
+
     comms.init(_server,_settings);
-    storage = require("./storage");
-    app = createUI(settings);
+    
     nodeApp = express();
-    
-    app.get("/flows",function(req,res) {
-        res.json(redNodes.getFlows());
-    });
-    
-    app.post("/flows",
-        express.json(),
-        function(req,res) {
-            var flows = req.body;
-            redNodes.setFlows(flows).then(function() {
-                res.send(204);
-            }).otherwise(function(err) {
-                util.log("[red] Error saving flows : "+err);
-                res.send(500,err.message);
-            });
-        },
-        function(error,req,res,next) {
-            res.send(400,"Invalid Flow");
-        }
-    );
-    
+    app = express();
         
-    app.get("/nodes",function(req,res) {
-        if (req.get("accept") == "application/json") {
-            res.json(redNodes.getNodeList());
-        } else {
-            res.send(redNodes.getNodeConfigs());
+    if (settings.httpAdminRoot !== false) {
+        
+        
+        if (!settings.disableEditor) {
+            createUI(settings,app);
         }
-    });
-    
-    app.post("/nodes",
-        express.json(),
-        function(req,res) {
-            if (!settings.available()) {
-                res.send(400,new Error("Settings unavailable").toString());
-                return;
+        
+        app.get("/flows",function(req,res) {
+            res.json(redNodes.getFlows());
+        });
+        
+        app.post("/flows",
+            express.json(),
+            function(req,res) {
+                var flows = req.body;
+                redNodes.setFlows(flows).then(function() {
+                    res.send(204);
+                }).otherwise(function(err) {
+                    util.log("[red] Error saving flows : "+err);
+                    res.send(500,err.message);
+                });
+            },
+            function(error,req,res,next) {
+                res.send(400,"Invalid Flow");
             }
-            var node = req.body;
-            var promise;
-            if (node.file) {
-                promise = redNodes.addNode(node.file).then(reportAddedModules);
-            } else if (node.module) {
-                var module = redNodes.getNodeModuleInfo(node.module);
-                if (module) {
-                    res.send(400,"Module already loaded");
+        );
+            
+        app.get("/nodes",function(req,res) {
+            if (req.get("accept") == "application/json") {
+                res.json(redNodes.getNodeList());
+            } else {
+                res.send(redNodes.getNodeConfigs());
+            }
+        });
+        
+        app.post("/nodes",
+            express.json(),
+            function(req,res) {
+                if (!settings.available()) {
+                    res.send(400,new Error("Settings unavailable").toString());
                     return;
                 }
-                promise = installModule(node.module);
-            } else {
-                res.send(400,"Invalid request");
-                return;
-            }
-            promise.then(function(info) {
-                res.json(info);
-            }).otherwise(function(err) {
-                if (err.code === 404) {
-                    res.send(404);
-                } else {
-                    res.send(400,err.toString());
-                }
-            });
-        },
-        function(err,req,res,next) {
-            console.log(err.toString());
-            res.send(400,err);
-        }
-    );
-    
-    app.delete("/nodes/:id",
-        function(req,res) {
-            if (!settings.available()) {
-                res.send(400,new Error("Settings unavailable").toString());
-                return;
-            }
-            var id = req.params.id;
-            var removedNodes = [];
-            try {
-                var node = redNodes.getNodeInfo(id);
-                var promise = null;
-                if (!node) {
-                    var module = redNodes.getNodeModuleInfo(id);
-                    if (!module) {
-                        res.send(404);
+                var node = req.body;
+                var promise;
+                if (node.file) {
+                    promise = redNodes.addNode(node.file).then(reportAddedModules);
+                } else if (node.module) {
+                    var module = redNodes.getNodeModuleInfo(node.module);
+                    if (module) {
+                        res.send(400,"Module already loaded");
                         return;
-                    } else {
-                        promise = uninstallModule(id);
                     }
+                    promise = installModule(node.module);
                 } else {
-                    promise = when.resolve([redNodes.removeNode(id)]).then(reportRemovedModules);
+                    res.send(400,"Invalid request");
+                    return;
                 }
-                
-                promise.then(function(removedNodes) {
-                    res.json(removedNodes);
-                }).otherwise(function(err) {
-                    console.log(err.stack);
-                    res.send(400,err.toString());
-                });
-            } catch(err) {
-                res.send(400,err.toString());
-            }
-        },
-        function(err,req,res,next) {
-            res.send(400,err);
-        }
-    );
-    
-    app.get("/nodes/:id", function(req,res) {
-        var id = req.params.id;
-        var result = null;
-        if (req.get("accept") == "application/json") {
-            result = redNodes.getNodeInfo(id);
-        } else {
-            result = redNodes.getNodeConfig(id);
-        }
-        if (result) {
-            res.send(result);
-        } else {
-            res.send(404);
-        }
-    });
-    
-    app.put("/nodes/:id", 
-        express.json(),
-        function(req,res) {
-            if (!settings.available()) {
-                res.send(400,new Error("Settings unavailable").toString());
-                return;
-            }
-            var body = req.body;
-            if (!body.hasOwnProperty("enabled")) {
-                res.send(400,"Invalid request");
-                return;
-            }
-            try {
-                var info;
-                var id = req.params.id;
-                var node = redNodes.getNodeInfo(id);
-                if (!node) {
-                    res.send(404);
-                } else if (!node.err && node.enabled === body.enabled) {
-                    res.json(node);
-                } else {
-                    if (body.enabled) {
-                        info = redNodes.enableNode(id);
-                    } else {
-                        info = redNodes.disableNode(id);
-                    }
-                    if (info.enabled == body.enabled && !info.err) {
-                        comms.publish("node/"+(body.enabled?"enabled":"disabled"),info,false);
-                        util.log("[red] "+(body.enabled?"Enabled":"Disabled")+" node types:");
-                        for (var i=0;i<info.types.length;i++) {
-                            util.log("[red] - "+info.types[i]);
-                        }
-                    } else if (body.enabled && info.err) {
-                        util.log("[red] Failed to enable node:");
-                        util.log("[red] - "+info.name+" : "+info.err);
-                    }
+                promise.then(function(info) {
                     res.json(info);
+                }).otherwise(function(err) {
+                    if (err.code === 404) {
+                        res.send(404);
+                    } else {
+                        res.send(400,err.toString());
+                    }
+                });
+            },
+            function(err,req,res,next) {
+                console.log(err.toString());
+                res.send(400,err);
+            }
+        );
+        
+        app.delete("/nodes/:id",
+            function(req,res) {
+                if (!settings.available()) {
+                    res.send(400,new Error("Settings unavailable").toString());
+                    return;
                 }
-            } catch(err) {
-                res.send(400,err.toString());
-            }            
-        }
-    );
-    
+                var id = req.params.id;
+                var removedNodes = [];
+                try {
+                    var node = redNodes.getNodeInfo(id);
+                    var promise = null;
+                    if (!node) {
+                        var module = redNodes.getNodeModuleInfo(id);
+                        if (!module) {
+                            res.send(404);
+                            return;
+                        } else {
+                            promise = uninstallModule(id);
+                        }
+                    } else {
+                        promise = when.resolve([redNodes.removeNode(id)]).then(reportRemovedModules);
+                    }
+                    
+                    promise.then(function(removedNodes) {
+                        res.json(removedNodes);
+                    }).otherwise(function(err) {
+                        console.log(err.stack);
+                        res.send(400,err.toString());
+                    });
+                } catch(err) {
+                    res.send(400,err.toString());
+                }
+            },
+            function(err,req,res,next) {
+                res.send(400,err);
+            }
+        );
+        
+        app.get("/nodes/:id", function(req,res) {
+            var id = req.params.id;
+            var result = null;
+            if (req.get("accept") == "application/json") {
+                result = redNodes.getNodeInfo(id);
+            } else {
+                result = redNodes.getNodeConfig(id);
+            }
+            if (result) {
+                res.send(result);
+            } else {
+                res.send(404);
+            }
+        });
+        
+        app.put("/nodes/:id", 
+            express.json(),
+            function(req,res) {
+                if (!settings.available()) {
+                    res.send(400,new Error("Settings unavailable").toString());
+                    return;
+                }
+                var body = req.body;
+                if (!body.hasOwnProperty("enabled")) {
+                    res.send(400,"Invalid request");
+                    return;
+                }
+                try {
+                    var info;
+                    var id = req.params.id;
+                    var node = redNodes.getNodeInfo(id);
+                    if (!node) {
+                        res.send(404);
+                    } else if (!node.err && node.enabled === body.enabled) {
+                        res.json(node);
+                    } else {
+                        if (body.enabled) {
+                            info = redNodes.enableNode(id);
+                        } else {
+                            info = redNodes.disableNode(id);
+                        }
+                        if (info.enabled == body.enabled && !info.err) {
+                            comms.publish("node/"+(body.enabled?"enabled":"disabled"),info,false);
+                            util.log("[red] "+(body.enabled?"Enabled":"Disabled")+" node types:");
+                            for (var i=0;i<info.types.length;i++) {
+                                util.log("[red] - "+info.types[i]);
+                            }
+                        } else if (body.enabled && info.err) {
+                            util.log("[red] Failed to enable node:");
+                            util.log("[red] - "+info.name+" : "+info.err);
+                        }
+                        res.json(info);
+                    }
+                } catch(err) {
+                    res.send(400,err.toString());
+                }            
+            }
+        );
+    }
 }
 function reportAddedModules(info) {
     comms.publish("node/added",info,false);
@@ -330,7 +337,6 @@ function start() {
                             });
                         }
                     }
-                    
                 }
                 defer.resolve();
                 
diff --git a/red/ui.js b/red/ui.js
index 67f4ba666..16580bf12 100644
--- a/red/ui.js
+++ b/red/ui.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 IBM Corp.
+ * Copyright 2013, 2014 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  **/
 var express = require('express');
 var fs = require("fs");
-var app = express();
 var events = require("./events");
 var path = require("path");
 
@@ -24,13 +23,13 @@ var icon_paths = [path.resolve(__dirname + '/../public/icons')];
 var settings; // settings has to be global, otherwise variable not in scope for express
 
 events.on("node-icon-dir",function(dir) {
-        icon_paths.push(path.resolve(dir));
+    icon_paths.push(path.resolve(dir));
 });
 
 
-function setupUI(_settings) {
+function setupUI(_settings,app) {
     
-    settings = _settings; // TODO confirm if settings are needed
+    settings = _settings;
     
     // Need to ensure the url ends with a '/' so the static serving works
     // with relative paths
diff --git a/settings.js b/settings.js
index 9c7ecd958..3466b0470 100644
--- a/settings.js
+++ b/settings.js
@@ -55,6 +55,7 @@ module.exports = {
 
     // By default, the Node-RED UI is available at http://localhost:1880/
     // The following property can be used to specifiy a different root path.
+    // If set to false, this is disabled.
     //httpAdminRoot: '/admin',
 
     // You can protect the user interface with a userid and password by using the following property.
@@ -63,7 +64,8 @@ module.exports = {
 
     // Some nodes, such as HTTP In, can be used to listen for incoming http requests.
     // By default, these are served relative to '/'. The following property
-    // can be used to specifiy a different root path.
+    // can be used to specifiy a different root path. If set to false, this is
+    // disabled.
     //httpNodeRoot: '/nodes',
     
     // To password protect the node-defined HTTP endpoints, the following property
@@ -88,6 +90,11 @@ module.exports = {
     // to apply the same authentication to both parts.
     //httpAuth: {user:"user",pass:"5f4dcc3b5aa765d61d8327deb882cf99"},
     
+    // The following property can be used to disable the editor. The admin API
+    // is not affected by this option. To disable both the editor and the admin
+    // API, use either the httpRoot or httpAdminRoot properties
+    //disableEditor: false,
+    
     // The following property can be used to enable HTTPS
     // See http://nodejs.org/api/https.html#https_https_createserver_options_requestlistener
     // for details on its contents.
diff --git a/test/red/ui_spec.js b/test/red/ui_spec.js
index 5d561fe6e..b9de7bff2 100644
--- a/test/red/ui_spec.js
+++ b/test/red/ui_spec.js
@@ -15,10 +15,13 @@
  **/
 var request = require("supertest");
 var express = require("express");
+var redUI = require("../../red/ui");
+
 
 describe("red/ui icon handler", function() {
     it('returns the default icon when getting an unknown icon', function(done) {
-        var app = require("../../red/ui")();
+        var app = express();
+        redUI({},app);
         request(app)
             .get("/icons/youwonthaveme.png")
             .expect('Content-Type', /image\/png/)
@@ -32,7 +35,8 @@ describe("red/ui icon handler", function() {
     });
     
     it('returns an icon from disk', function(done) {
-        var app = require("../../red/ui")();
+        var app = express();
+        redUI({},app);
         request(app)
             .get("/icons/arduino.png")
             .expect('Content-Type', /image\/png/)
@@ -82,7 +86,8 @@ describe("icon cache handler", function() {
      * the default PNG would be served
      */
     it('returns an icon using icon cache', function(done) {        
-        var app = require("../../red/ui")();
+        var app = express();
+        redUI({},app);
         events.emit("node-icon-dir", tempDir);
         request(app)
             .get("/icons/cacheMe.png")
@@ -117,41 +122,45 @@ describe("red/ui settings handler", function() {
                 httpNodeRoot: "testHttpNodeRoot",
                 version: "testVersion",
         };
-        var app = require("../../red/ui")(settings);
-        
+        var app = express();
+        redUI(settings,app);
         request(app)
-        .get("/settings")
-        .expect('Content-Type', /application\/json/)
-        .expect(200, "{\n  \"httpNodeRoot\": \"testHttpNodeRoot\",\n  \"version\": \"testVersion\"\n}")
-        .end(function(err, res){
-            if (err){
-                return done(err);
-            }
-            done();
-          });
+            .get("/settings")
+            .expect('Content-Type', /application\/json/)
+            .expect(200, "{\n  \"httpNodeRoot\": \"testHttpNodeRoot\",\n  \"version\": \"testVersion\"\n}")
+            .end(function(err, res){
+                if (err){
+                    return done(err);
+                }
+                done();
+            });
         
     });
 });
 
 describe("red/ui root handler", function() {
     it('server up the main page', function(done) {
-        var app = require("../../red/ui")();
+        var app = express();
+        redUI({},app);
         
         request(app)
-        .get("/")
-        .expect('Content-Type', /text\/html/)
-        .expect(200)
-        .end(function(err, res){
-            if (err){
-                return done(err);
-            }
-            done();
-          });
+            .get("/")
+            .expect('Content-Type', /text\/html/)
+            .expect(200)
+            .end(function(err, res){
+                if (err){
+                    return done(err);
+                }
+                done();
+            });
         
     });
     
     it('redirects to path ending with /', function(done) {
-        var app = express().use('/root', require("../../red/ui")());
+        var rapp = express();
+        redUI({},rapp);
+
+        var app = express().use('/root', rapp);
         
         request(app)
         .get("/root")