diff --git a/electron.js b/electron.js
index 3f94b65..9af17d8 100644
--- a/electron.js
+++ b/electron.js
@@ -151,6 +151,33 @@ app.post('/new',function(req,res) {
     }
 });
 
+app.post('/rename',function(req,res) {
+    console.log(req.body.name);
+    if(!req.body.oldname) {
+        res.send(JSON.stringify({status:'missing sketch old name'}));
+        res.end();
+        return;
+    }
+    if(!req.body.newname) {
+        res.send(JSON.stringify({status:'missing sketch new name'}));
+        res.end();
+        return;
+    }
+
+    try {
+        var oldname = req.body.oldname;
+        var newname = req.body.newname;
+        sketches.renameSketch(oldname,newname, function(name) {
+            res.send(JSON.stringify({status:'okay', name:name}));
+            res.end();
+        })
+    } catch(err) {
+        console.log(err);
+        err.printStackTrace();
+        res.end(JSON.stringify({status:'error',output:err.toString()}));
+    }
+});
+
 app.post('/sketches/delete', function(req,res){
     console.log(req.body.name);
     if(!req.body.name) {
diff --git a/public/index.html b/public/index.html
index b1ff534..0ab55b6 100644
--- a/public/index.html
+++ b/public/index.html
@@ -46,6 +46,33 @@ <h4 class="modal-title">New Sketch</h4>
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 
+
+
+<!-- rename sketch dialog -->
+<div id='rename-sketch-dialog' class="modal fade">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">Rename Sketch</h4>
+      </div>
+      <div class="modal-body">
+          <form>
+              <div class='form-group'>
+                  <label>Sketch Name</label>
+                  <input type='hidden' class='form-control old-name' value='NewSketch'>
+                  <input type='text' class='form-control new-name' value='NewSketch'>
+              </div>
+          </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        <button type="button" class="btn btn-primary" id='rename-sketch-button'>Create Sketch</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
 <nav class="navbar navbar-default navbar-fixed-top " role="navigation">
   <div class="container-fluid">
 
@@ -419,6 +446,11 @@ <h3>Sketches</h3>
         e.stopPropagation();
         var name = $(this).attr('data-name');
         console.log('renaming',name);
+
+        $("#rename-sketch-dialog .old-name").val(name);
+        $("#rename-sketch-dialog .new-name").val(name);
+
+        $("#rename-sketch-dialog").modal('show');
     });
     $("#sketch-picker .delete-button").click(function(e) {
         e.preventDefault();
@@ -485,6 +517,22 @@ <h3>Sketches</h3>
 
 });
 
+$("#rename-sketch-button").click(function(e) {
+    e.preventDefault();
+    $("#rename-sketch-dialog").modal('hide');
+    var oldname = $("#rename-sketch-dialog .old-name").val();
+    var newname = $("#rename-sketch-dialog .new-name").val();
+    console.log('renaming name = ',oldname, 'to',newname);
+    POST('/rename', {oldname:oldname, newname:newname}, function(res) {
+        console.log("response from rename is ",res);
+        if(res.status == 'error') {
+            appendConsoleResponse(res.output);
+        } else {
+            fetchSketches(populateSketches);
+        }
+    })
+});
+
 $("#edit-sketches-button").click(function(e) {
     e.preventDefault();
     $("#sketch-picker .edit-button").toggleClass('hidden');
diff --git a/sketches.js b/sketches.js
index b2b7a54..60c3822 100644
--- a/sketches.js
+++ b/sketches.js
@@ -26,6 +26,21 @@ exports.deleteSketch = function(name, cb) {
     if(cb) cb(name);
 }
 
+exports.renameSketch = function(oldname, newname, cb) {
+    fs.rename(
+        plat.getUserSketchesDir()+'/'+oldname,
+        plat.getUserSketchesDir()+'/'+newname, function(err) {
+        console.log("rename error = ",err);
+
+        fs.rename(
+            plat.getUserSketchesDir()+'/'+newname+'/'+oldname+'.ino',
+            plat.getUserSketchesDir()+'/'+newname+'/'+newname+'.ino', function(err) {
+                console.log("rename error = ",err);
+                cb(newname);
+            });
+    });
+}
+
 exports.listSketches = function(cb) {
     var list = fs.readdirSync(plat.getUserSketchesDir());
     list = list.filter(function(file) {
diff --git a/test_homedir.js b/test_homedir.js
new file mode 100644
index 0000000..45ea656
--- /dev/null
+++ b/test_homedir.js
@@ -0,0 +1,5 @@
+var platform = require('./platform');
+
+var plat = platform.getDefaultPlatform();
+
+console.log("hoemdir = ",plat.getUserHome());