diff --git a/.gitignore b/.gitignore
index 5fcc507..102c661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pom.xml
 lib
 classes
 *~
+.lein-deps-sum
diff --git a/Procfile b/Procfile
index 09a6c19..92abe1c 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: lein run
+web: java -Djava.security.policy=example.policy $JVM_OPTS -cp target/tryclojure-standalone.jar clojure.main -m tryclojure.server $PORT
diff --git a/README.md b/README.md
index 67d773e..65cfeb7 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,13 @@
 
 TryClojure is a online Clojure REPL written using Noir and Chris Done's jquery console (you're awesome, Chris).
 
+[<img src="https://secure.travis-ci.org/Raynes/tryclojure.png"/>](http://travis-ci.org/Raynes/tryclojure)
+
 ## Usage
 
 http://tryclj.com
 
-If you want to run it, refer to https://github.com/Raynes/tryclojure/wiki/Running-Tryclojure
+To run it locally, use `lein ring server`.
 
 ## Credits
 
diff --git a/project.clj b/project.clj
index 7ae763e..44808a1 100644
--- a/project.clj
+++ b/project.clj
@@ -1,10 +1,13 @@
 (defproject tryclojure "0.1.0-SNAPSHOT"
   :description "A simple web-based Clojure REPL for trying out Clojure without having to install it."
   :dependencies [[org.clojure/clojure "1.4.0"]
-                 [noir "1.3.0-beta10"]
-		 [commons-lang/commons-lang "2.5"]
-                 [clojail "1.0.1"]]
-  :jvm-opts ["-Djava.security.policy=example.policy""-Xmx80M"]
-  :main tryclojure.server)
-
-
+                 [lib-noir "0.8.1"]
+                 [compojure "1.1.6"]
+                 [ring-server "0.3.1"]
+                 [commons-lang/commons-lang "2.5"]
+                 [clojail "1.0.6"]]
+  :jvm-opts ["-Djava.security.policy=example.policy" "-Xmx80M"]
+  :min-lein-version "2.0.0"
+  :uberjar-name "tryclojure-standalone.jar"
+  :plugins [[lein-ring "0.8.10"]]
+  :ring {:handler tryclojure.server/app :port 8801})
diff --git a/resources/public/css/gh-fork-ribbon.css b/resources/public/css/gh-fork-ribbon.css
new file mode 100644
index 0000000..6fe4efb
--- /dev/null
+++ b/resources/public/css/gh-fork-ribbon.css
@@ -0,0 +1,82 @@
+/* From https://github.com/simonwhitaker/github-fork-ribbon-css */
+
+/* Left will inherit from right (so we don't need to duplicate code */
+.github-fork-ribbon {
+  /* The right and left lasses determine the side we attach our banner to */
+  position: absolute;
+
+  /* Add a bit of padding to give some substance outside the "stitching" */
+  padding: 2px 0;
+
+  /* Set the base colour */
+  background-color: #5881d8;
+
+  /* Set a gradient: transparent black at the top to almost-transparent black at the bottom */
+  background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0.00)), to(rgba(0, 0, 0, 0.15)));
+  background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15));
+  background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15));
+  background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15));
+  background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15));
+  background-image: linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15));
+  filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#000000', EndColorStr='#000000');
+
+  /* Add a drop shadow */
+  -webkit-box-shadow: 0px 2px 3px 0px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 2px 3px 0px rgba(0, 0, 0, 0.5);
+}
+.github-fork-ribbon a {
+  /* Set the font */
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: 700;
+  color: white;
+
+  /* Set the text properties */
+  text-decoration: none;
+  text-shadow: 0 -1px rgba(0,0,0,0.5);
+  text-align: center;
+
+  /* Set the geometry. If you fiddle with these you'll also need to tweak the top and right values in #github-fork-ribbon. */
+  width: 200px;
+  line-height: 20px;
+
+  /* Set the layout properties */
+  display: inline-block;
+  padding: 2px 0;
+
+  /* Add "stitching" effect */
+  border-width: 1px 0;
+  border-style: dotted;
+  border-color: rgba(255,255,255,0.7);
+}
+
+.github-fork-ribbon-wrapper {
+  width: 150px;
+  height: 150px;
+  position: absolute;
+  overflow: hidden;
+  top: 0;
+}
+
+.github-fork-ribbon-wrapper.right {
+  right: 0;
+}
+
+.github-fork-ribbon-wrapper.right .github-fork-ribbon {
+  top: 42px;
+  right: -43px;
+
+  /* Rotate the banner 45 degrees */
+  -webkit-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
+  -o-transform: rotate(45deg);
+  transform: rotate(45deg);
+}
+
+@media (max-width: 619px) {
+
+  .github-fork-ribbon {
+    zoom: 0.6;
+  }
+
+}
diff --git a/resources/public/css/tryclojure.css b/resources/public/css/tryclojure.css
index 58801f8..e5145d8 100644
--- a/resources/public/css/tryclojure.css
+++ b/resources/public/css/tryclojure.css
@@ -1,137 +1,134 @@
 body {
- background: #fff;
- text-align: center;
+  background: #F7F7F7;
+  text-align: center;
+  font-family: Helvetica, sans-serif;
+  color: #6C7B89;
 }
 
 #wrapper {
- text-align: left;
- width: 620px;
- margin: 0 auto;
- border-radius: 5px;
- border: 5px solid #eee;
+  text-align: left;
+  width: 620px;
+  margin: 0 auto;
 }
 
 #header {
- background: #fff;
- margin-top: 24px;
- margin: 10px;
+  margin: 20px 0px 20px 190px;
 }
 
 #header h1 {
- height: 72px;
- line-height: 72px;
- background: url(/resources/public/clojure-logo.png) no-repeat;
- margin: 0;
- padding: 0;
- padding-left: 75px;
- font-family: Arial, sans-serif;
- font-weight: normal;
- font-size: 48px;
+  height: 72px;
+  line-height: 72px;
+  background: url(../clojure-logo.png) no-repeat;
+  padding: 0px 0px 0px 80px;
+  font-weight: normal;
+  font-size: 36px;
 }
 
 #header h1 span.logo-try {
- color: #63b132;
- display:inline;
+  color: #63b132;
+  display:inline;
 }
 
 #header h1 span.logo-clojure {
- color: #5881d8;
- display:inline
+  color: #2B4A8B;
+  display:inline
+}
+
+#container {
+  margin-bottom: 40px;
 }
 
 #console {
- height: 220px;
- background: #eee;
- margin: 10px;
- border-radius: 5px;
- -moz-border-radius: 5px;
- border: 1px solid #aaa;
+  height: 220px;
+  padding: 10px;
+  background: #FFFFFF;
+  font-family: monospace;
+  font-size: 14px;
+  color: #6C7B89;
+  margin-bottom: 10px;
+}
+
+#console textarea {
+  /* Use a largish font to ensure iOS doesn't zoom in on focus */
+  font-size: 2em;
 }
 
-#console div.jquery-console-inner { 
- width:580px;
- height:200px; 
- margin: 10px 10px;
- overflow:auto; 
- text-align:left;
+#console div.jquery-console-inner {
+  width:580px;
+  height:200px;
+  margin: 10px 10px;
+  overflow:auto;
+  text-align:left;
 }
+
 #console div.jquery-console-message-value {
-  color:#0066FF; 
-  font-family:monospace;
-  padding:0.1em; 
+  color:#63b132;
 }
+
 #console div.jquery-console-prompt-box {
- color:#444; font-family:monospace; 
+  color: #6C7B89;
 }
+
 #console div.jquery-console-focus span.jquery-console-cursor {
- background:#333; color:#eee; font-weight:bold;
+  background:#6C7B89;
+  color: #FFFFFF;
 }
+
 #console div.jquery-console-message-error {
- color:#ef0505; font-family:sans-serif; font-weight:bold;
- padding:0.1em; 
+  color:#FD713B;
 }
+
 #console div.jquery-console-message-success {
- color:#187718; font-family:monospace;
- padding:0.1em; 
-}
-#console span.jquery-console-prompt-label { 
- font-weight:bold;
+  color:#63b132;
 }
 
-.bottom { 
- background-color: white; color: #333; 
-}
-.bottom a,a:visited { 
- color: #111; 
-}
-table.bottom { 
- width: 100%; border: 1px solid black;
+#console span.jquery-console-prompt-label {
+  font-weight:bold;
 }
 
 #buttons {
- background: transparent;
- text-align: center;
- margin-top: 10px;
-}
-#buttons a { 
-/* color: #4881d8;*/
- color: #3D5B99;
- padding: .3em 1em;
- margin-right: .7em;
- font-family: Helvetica, sans-serif;
- font-size: 16px; 
- font-weight: bold;
- background: #90b4fe;
- border-radius: 5px;
- -moz-border-radius: 5px;
+  background: transparent;
+  text-align: center;
+  margin-bottom: 10px;
 }
+
+#buttons a {
+  display: inline-block;
+  color: #2B4A8B;
+  padding: 2px 2px;
+  border-bottom: 2px solid #2B4A8B;
+  text-transform: uppercase;
+  margin: 10px;
+  font-family: Helvetica, sans-serif;
+  font-size: 16px;
+  transition: all 100ms;
+}
+
 #buttons a.last {
- margin-right: 0;
+  margin-right: 0;
 }
+
 #buttons a:hover {
- color: #5881d8;
- cursor: pointer; 
+  cursor: pointer;
 }
 
-#changer { 
- margin: 10px;
- padding: 0.25em 0.5em 0.25em 0.5em;
- background: #EAF2F5;
- border-radius: 5px;
- -moz-border-radius: 5px;
- border: 1px solid #BEDCE7;
+#changer {
+  line-height: 1.3em;
+  padding: 20px;
+  background: #D6DADD;
+  margin-bottom: 10px;
 }
 
-#changer h3 {
-  color: #555;
+#changer p {
+    margin: 0.6em;
 }
 
-#changer p {
- background: transparent;
- line-height: 1.3em;
- font-family: Arial, serif;
- font-size: 16px;
- color: #555;
+#changer a {
+  color: #2B4A8B;
+}
+
+#changer a:visited {
+  color: #60749E;
 }
 
 #changer code {
@@ -142,25 +139,34 @@ table.bottom {
   padding: 0.1em 0.25em 0.1em 0.25em;
 }
 
-div#tuttext {
+#changer ul {
+  margin: 0px;
+  padding: 0px;
+  list-style: none;
+}
+
+#tuttext {
 }
 
-div.continue {
- width: 100%;
- text-align: center;
- padding-top: 0.5em; 
+.continue {
+  width: 100%;
+  text-align: center;
+  padding-top: 0.5em;
 }
 
-div.footer { 
- text-align: center; 
+.footer {
+  text-align: center;
 }
 
 /* Coderay alpha style */
+code {
+  display: inline-block;
+}
+
 .code {
- border-radius: 2px;
- -moz-border-radius: 1px;
- color: #000;
+  color: #000;
 }
+
 .code pre { margin: 0px; }
 
 span.code { white-space: pre; border: 0px; padding: 2px; }
@@ -177,37 +183,51 @@ table.code td { padding: 2px 4px; vertical-align: top; }
 
 /* keywords */
 #changer .code span.r {
- color: #0000ff;
- font-weight: bold;
+  color: #0000ff;
+  font-weight: bold;
 }
 
 /* symbols */
 #changer .code span.sy {
- color: #318495;
+  color: #318495;
 }
 
 /* strings */
 #changer .code span.s {
- color: #008800;
+  color: #008800;
 }
 
 /* paren */
 #changer .code span.of {
- color: #222;
- font-weight: bold;
+  color: #222;
+  font-weight: bold;
 }
 
 /* comment */
 #changer .code span.c {
- color: #ccc;
+  color: #ccc;
 }
 
 /* operator */
 #changer .code span.cl {
- 
+
 }
 
 /* number */
 #changer .code span.i {
- color: #ff0000;
+  color: #ff0000;
+}
+
+@media (max-width: 619px) {
+
+  #wrapper {
+    width: 100%;
+  }
+  #header {
+    margin: 20px auto;
+  }
+  #console div.jquery-console-inner {
+    width: auto;
+  }
+
 }
diff --git a/resources/public/javascript/jquery-console/README b/resources/public/javascript/jquery-console/README
index 245420f..c5d2de3 100644
--- a/resources/public/javascript/jquery-console/README
+++ b/resources/public/javascript/jquery-console/README
@@ -1,6 +1,6 @@
 INTRODUCTION
 
-See demo.html. Or here: http://chrisdone.com/jquery-console/demo.html
+See demo.html. Or here: http://chrisdone.com/jquery-console/
 
 Options available:
 
@@ -18,6 +18,10 @@ Options available:
 
  promptLabel            string    Prompt string like 'JavaScript> '.
 
+ cols                   integer   the number of cols, this value is only
+                                  used by the command completion to format
+                                  the list of results.
+
  commandValidate        function  When user hits return, validate
                                   whether to trigger commandHandle and
                                   re-prompt.
@@ -30,6 +34,10 @@ Options available:
                                   to report a result of the command
                                   asynchronously.
 
+ commandComplete        function  Handle the command completion when the
+                                  tab key is pressed. It returns a list
+                                  of string completion suffixes.
+
  animateScroll          bool      Whether to animate the scroll to
                                   top. Currently disabled.
 
@@ -39,6 +47,9 @@ Options available:
 
  cancelHandle           function  Handle a user-signaled interrupt.
 
+ fadeOnReset            bool      Whether to trigger a fade in/out when
+                                  the console is reset.  Defaults to true.
+
 LICENSE
 
 Copyright 2010 Chris Done, Simon David Pratt. All rights reserved.
@@ -68,5 +79,3 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-
diff --git a/resources/public/javascript/jquery-console/demo.html b/resources/public/javascript/jquery-console/demo.html
index 370ca73..7f85186 100644
--- a/resources/public/javascript/jquery-console/demo.html
+++ b/resources/public/javascript/jquery-console/demo.html
@@ -102,6 +102,33 @@
            },
            promptHistory:true
          });
+         /* Fifth console */
+         var console5 = $('<div class="console1">');
+         $('body').append(console5);
+         var controller5  = console5.console({
+          promptLabel: 'Complete> ',
+          commandHandle:function(line){
+            if (line) {
+              return [{msg:"you typed " + line,className:"jquery-console-message-value"}];
+            } else {
+              var m = "type a color among (" + this.colors.join(", ") + ")";
+              return [{msg:m,className:"jquery-console-message-value"}];
+            }
+          },
+          colors: ["red","blue","green","black","yellow","white","grey"],
+          cols: 40,
+          completeHandle:function(prefix){
+            var colors = this.colors;
+            var ret = [];
+            for (var i=0;i<colors.length;i++) {
+              var color=colors[i];
+              if (color.lastIndexOf(prefix,0) === 0) {
+                ret.push(color.substring(prefix.length));
+              }
+            }
+            return ret;
+          }
+         })
        });
     </script>
     <style type="text/css" media="screen">
diff --git a/resources/public/javascript/jquery-console/jquery.console.js b/resources/public/javascript/jquery-console/jquery.console.js
index 1766fb5..5c1ac3f 100644
--- a/resources/public/javascript/jquery-console/jquery.console.js
+++ b/resources/public/javascript/jquery-console/jquery.console.js
@@ -38,612 +38,718 @@
 //   Google Chrome 5.0.375.55 (Mac)
 
 (function($){
-    $.fn.console = function(config){
-        ////////////////////////////////////////////////////////////////////////
-        // Constants
-        // Some are enums, data types, others just for optimisation
-        var keyCodes = {
-	    // left
-	    37: moveBackward,
-	    // right
-	    39: moveForward,
-	    // up
-	    38: previousHistory,
-	    // down
-	    40: nextHistory,
-	    // backspace
-	    8:  backDelete,
-	    // delete
-	    46: forwardDelete,
-            // end
-	    35: moveToEnd,
-	    // start
-	    36: moveToStart,
-	    // return
-	    13: commandTrigger,
-	    // tab
-	    18: doNothing
-	};
-	var ctrlCodes = {
-	    // C-a
-	    65: moveToStart,
-	    // C-e
-	    69: moveToEnd,
-	    // C-d
-	    68: forwardDelete,
-	    // C-n
-	    78: nextHistory,
-	    // C-p
-	    80: previousHistory,
-	    // C-b
-	    66: moveBackward,
-	    // C-f
-	    70: moveForward,
-	    // C-k
-	    75: deleteUntilEnd
-	};
-	var altCodes = {
-	    // M-f
-	    70: moveToNextWord,
-	    // M-b
-	    66: moveToPreviousWord,
-	    // M-d
-	    68: deleteNextWord
-	};
-        var cursor = '<span class="jquery-console-cursor">&nbsp;</span>';
-
-        ////////////////////////////////////////////////////////////////////////
-        // Globals
-        var container = $(this);
-        var inner = $('<div class="jquery-console-inner"></div>');
-        // erjiang: changed this from a text input to a textarea so we
-        // can get pasted newlines
-        var typer = $('<textarea class="jquery-console-typer"></textarea>');
-        // Prompt
-        var promptBox;
-        var prompt;
-        var promptLabel = config && config.promptLabel? config.promptLabel : "> ";
-        var continuedPromptLabel = config && config.continuedPromptLabel?
-        config.continuedPromptLabel : "> ";
-        var column = 0;
-        var promptText = '';
-        var restoreText = '';
-        var continuedText = '';
-        // Prompt history stack
-        var history = [];
-        var ringn = 0;
-        // For reasons unknown to The Sword of Michael himself, Opera
-        // triggers and sends a key character when you hit various
-        // keys like PgUp, End, etc. So there is no way of knowing
-        // when a user has typed '#' or End. My solution is in the
-        // typer.keydown and typer.keypress functions; I use the
-        // variable below to ignore the keypress event if the keydown
-        // event succeeds.
-        var cancelKeyPress = 0;
-	// When this value is false, the prompt will not respond to input
-	var acceptInput = true;
-	// When this value is true, the command has been canceled
-	var cancelCommand = false;
-
-        // External exports object
-        var extern = {};
-
-        ////////////////////////////////////////////////////////////////////////
-        // Main entry point
-        (function(){
-            container.append(inner);
-            inner.append(typer);
-            typer.css({position:'absolute',top:0,left:'-9999px'});
-            if (config.welcomeMessage)
-                message(config.welcomeMessage,'jquery-console-welcome');
-            newPromptBox();
-            if (config.autofocus) {
-                inner.addClass('jquery-console-focus');
-                typer.focus();
-                setTimeout(function(){
-                    inner.addClass('jquery-console-focus');
-                    typer.focus();
-                },100);
-            }
-            extern.inner = inner;
-            extern.typer = typer;
-            extern.scrollToBottom = scrollToBottom;
-        })();
-
-        ////////////////////////////////////////////////////////////////////////
-        // Reset terminal
-        extern.reset = function(){
-            var welcome = (typeof config.welcomeMessage != 'undefined');
-            inner.parent().fadeOut(function(){
-                inner.find('div').each(function(){
-                    if (!welcome) {
-                        $(this).remove();
-		    } else {
-			welcome = false;
-		    }
-                });
-                newPromptBox();
-                inner.parent().fadeIn(function(){
-                    inner.addClass('jquery-console-focus');
-                    typer.focus();
-                });
-            });
-        };
-
-        ////////////////////////////////////////////////////////////////////////
-        // Reset terminal
-        extern.notice = function(msg,style){
-            var n = $('<div class="notice"></div>').append($('<div></div>').text(msg))
-                .css({visibility:'hidden'});
-            container.append(n);
-            var focused = true;
-            if (style=='fadeout')
-                setTimeout(function(){
-                    n.fadeOut(function(){
-                        n.remove();
-                    });
-                },4000);
-            else if (style=='prompt') {
-                var a = $('<br/><div class="action"><a href="javascript:">OK</a><div class="clear"></div></div>');
-                n.append(a);
-                focused = false;
-                a.click(function(){ n.fadeOut(function(){ n.remove();inner.css({opacity:1}) }); });
-            }
-            var h = n.height();
-            n.css({height:'0px',visibility:'visible'})
-                .animate({height:h+'px'},function(){
-                    if (!focused) inner.css({opacity:0.5});
-                });
-            n.css('cursor','default');
-            return n;
-        };
-
-        ////////////////////////////////////////////////////////////////////////
-        // Make a new prompt box
-        function newPromptBox() {
-            column = 0;
-            promptText = '';
-	    ringn = 0; // Reset the position of the history ring
-	    enableInput();
-            promptBox = $('<div class="jquery-console-prompt-box"></div>');
-            var label = $('<span class="jquery-console-prompt-label"></span>');
-            var labelText = extern.continuedPrompt? continuedPromptLabel : promptLabel;
-            promptBox.append(label.text(labelText).show());
-            label.html(label.html().replace(' ','&nbsp;'));
-            prompt = $('<span class="jquery-console-prompt"></span>');
-            promptBox.append(prompt);
-            inner.append(promptBox);
-            updatePromptDisplay();
-        };
-
-        ////////////////////////////////////////////////////////////////////////
-        // Handle setting focus
-        container.click(function(){
-            inner.addClass('jquery-console-focus');
-            inner.removeClass('jquery-console-nofocus');
-            typer.focus();
-            scrollToBottom();
-            return false;
-        });
-
-        ////////////////////////////////////////////////////////////////////////
-        // Handle losing focus
-        typer.blur(function(){
-            inner.removeClass('jquery-console-focus');
-            inner.addClass('jquery-console-nofocus');
-        });
-
-        ////////////////////////////////////////////////////////////////////////
-        // Bind to the paste event of the input box so we know when we
-        // get pasted data
-        typer.bind('paste', function(e) {
-            // wipe typer input clean just in case
-            typer.val("");
-            // this timeout is required because the onpaste event is
-            // fired *before* the text is actually pasted
-            setTimeout(function() {
-                typer.consoleInsert(typer.val());
-                typer.val("");
-            }, 0);
-        });
-
-        ////////////////////////////////////////////////////////////////////////
-        // Handle key hit before translation
-        // For picking up control characters like up/left/down/right
-
-        typer.keydown(function(e){
-            cancelKeyPress = 0;
-            var keyCode = e.keyCode;
-	    // C-c: cancel the execution
-	    if(e.ctrlKey && keyCode == 67) {
-		cancelKeyPress = keyCode;
-		cancelExecution();
-		return false;
-	    }
-	    if (acceptInput) {
-		if (keyCode in keyCodes) {
-                    cancelKeyPress = keyCode;
-		    (keyCodes[keyCode])();
-		    return false;
-		} else if (e.ctrlKey && keyCode in ctrlCodes) {
-                    cancelKeyPress = keyCode;
-		    (ctrlCodes[keyCode])();
-		    return false;
-		} else if (e.altKey  && keyCode in altCodes) {
-                    cancelKeyPress = keyCode;
-		    (altCodes[keyCode])();
-		    return false;
+	var isWebkit = !!~navigator.userAgent.indexOf(' AppleWebKit/');
+
+	$.fn.console = function(config){
+		////////////////////////////////////////////////////////////////////////
+		// Constants
+		// Some are enums, data types, others just for optimisation
+		var keyCodes = {
+			// left
+			37: moveBackward,
+			// right
+			39: moveForward,
+			// up
+			38: previousHistory,
+			// down
+			40: nextHistory,
+			// backspace
+			8:  backDelete,
+			// delete
+			46: forwardDelete,
+			// end
+			35: moveToEnd,
+			// start
+			36: moveToStart,
+			// return
+			13: commandTrigger,
+			// tab
+			18: doNothing,
+			// tab
+			9: doComplete
+		};
+		var ctrlCodes = {
+			// C-a
+			65: moveToStart,
+			// C-e
+			69: moveToEnd,
+			// C-d
+			68: forwardDelete,
+			// C-n
+			78: nextHistory,
+			// C-p
+			80: previousHistory,
+			// C-b
+			66: moveBackward,
+			// C-f
+			70: moveForward,
+			// C-k
+			75: deleteUntilEnd
+		};
+        if(config.ctrlCodes) {
+            $.extend(ctrlCodes, config.ctrlCodes);
+        }
+		var altCodes = {
+			// M-f
+			70: moveToNextWord,
+			// M-b
+			66: moveToPreviousWord,
+			// M-d
+			68: deleteNextWord
+		};
+		var shiftCodes = {
+			// return
+			13: newLine,
+		};
+		var cursor = '<span class="jquery-console-cursor">&nbsp;</span>';
+
+		////////////////////////////////////////////////////////////////////////
+		// Globals
+		var container = $(this);
+		var inner = $('<div class="jquery-console-inner"></div>');
+		// erjiang: changed this from a text input to a textarea so we
+		// can get pasted newlines
+		var typer = $('<textarea class="jquery-console-typer"></textarea>');
+		// Prompt
+		var promptBox;
+		var prompt;
+		var promptLabel = config && config.promptLabel? config.promptLabel : "> ";
+		var continuedPromptLabel = config && config.continuedPromptLabel?
+		config.continuedPromptLabel : "> ";
+		var column = 0;
+		var promptText = '';
+		var restoreText = '';
+		var continuedText = '';
+		var fadeOnReset = config.fadeOnReset !== undefined ? config.fadeOnReset : true;
+		// Prompt history stack
+		var history = [];
+		var ringn = 0;
+		// For reasons unknown to The Sword of Michael himself, Opera
+		// triggers and sends a key character when you hit various
+		// keys like PgUp, End, etc. So there is no way of knowing
+		// when a user has typed '#' or End. My solution is in the
+		// typer.keydown and typer.keypress functions; I use the
+		// variable below to ignore the keypress event if the keydown
+		// event succeeds.
+		var cancelKeyPress = 0;
+		// When this value is false, the prompt will not respond to input
+		var acceptInput = true;
+		// When this value is true, the command has been canceled
+		var cancelCommand = false;
+
+		// External exports object
+		var extern = {};
+
+		////////////////////////////////////////////////////////////////////////
+		// Main entry point
+		(function(){
+			container.append(inner);
+			inner.append(typer);
+			typer.css({position:'absolute',top:0,left:'-9999px'});
+			if (config.welcomeMessage)
+				message(config.welcomeMessage,'jquery-console-welcome');
+			newPromptBox();
+			if (config.autofocus) {
+				inner.addClass('jquery-console-focus');
+				typer.focus();
+				setTimeout(function(){
+					inner.addClass('jquery-console-focus');
+					typer.focus();
+				},100);
+			}
+			extern.inner = inner;
+			extern.typer = typer;
+			extern.scrollToBottom = scrollToBottom;
+		})();
+
+		////////////////////////////////////////////////////////////////////////
+		// Reset terminal
+		extern.reset = function(){
+			var welcome = (typeof config.welcomeMessage != 'undefined');
+
+			var removeElements = function() {
+				inner.find('div').each(function(){
+					if (!welcome) {
+						$(this).remove();
+					} else {
+						welcome = false;
+					}
+				});
+			};
+
+			var focusConsole = function() {
+				inner.addClass('jquery-console-focus');
+				typer.focus();
+			};
+
+			if (fadeOnReset) {
+				inner.parent().fadeOut(function() {
+					removeElements();
+					newPromptBox();
+					inner.parent().fadeIn(focusConsole);
+				});
+			}
+			else {
+				removeElements();
+				newPromptBox();
+				focusConsole();
+			}
+		};
+
+		////////////////////////////////////////////////////////////////////////
+		// Reset terminal
+		extern.notice = function(msg,style){
+			var n = $('<div class="notice"></div>').append($('<div></div>').text(msg))
+				.css({visibility:'hidden'});
+			container.append(n);
+			var focused = true;
+			if (style=='fadeout')
+				setTimeout(function(){
+					n.fadeOut(function(){
+						n.remove();
+					});
+				},4000);
+			else if (style=='prompt') {
+				var a = $('<br/><div class="action"><a href="javascript:">OK</a><div class="clear"></div></div>');
+				n.append(a);
+				focused = false;
+				a.click(function(){ n.fadeOut(function(){ n.remove();inner.css({opacity:1}) }); });
+			}
+			var h = n.height();
+			n.css({height:'0px',visibility:'visible'})
+				.animate({height:h+'px'},function(){
+					if (!focused) inner.css({opacity:0.5});
+				});
+			n.css('cursor','default');
+			return n;
+		};
+
+		////////////////////////////////////////////////////////////////////////
+		// Make a new prompt box
+		function newPromptBox() {
+			column = 0;
+			promptText = '';
+			ringn = 0; // Reset the position of the history ring
+			enableInput();
+			promptBox = $('<div class="jquery-console-prompt-box"></div>');
+			var label = $('<span class="jquery-console-prompt-label"></span>');
+			var labelText = extern.continuedPrompt? continuedPromptLabel : promptLabel;
+			promptBox.append(label.text(labelText).show());
+			label.html(label.html().replace(' ','&nbsp;'));
+			prompt = $('<span class="jquery-console-prompt"></span>');
+			promptBox.append(prompt);
+			inner.append(promptBox);
+			updatePromptDisplay();
+		};
+
+		////////////////////////////////////////////////////////////////////////
+		// Handle setting focus
+		container.click(function(){
+			// Don't mess with the focus if there is an active selection
+			if (window.getSelection().toString()) {
+				return false;
+			}
+
+			inner.addClass('jquery-console-focus');
+			inner.removeClass('jquery-console-nofocus');
+			if (isWebkit) {
+				typer.focusWithoutScrolling();
+			} else {
+				typer.css('position', 'fixed').focus();
+			}
+			scrollToBottom();
+			return false;
+		});
+
+		////////////////////////////////////////////////////////////////////////
+		// Handle losing focus
+		typer.blur(function(){
+			inner.removeClass('jquery-console-focus');
+			inner.addClass('jquery-console-nofocus');
+		});
+
+		////////////////////////////////////////////////////////////////////////
+		// Bind to the paste event of the input box so we know when we
+		// get pasted data
+		typer.bind('paste', function(e) {
+			// wipe typer input clean just in case
+			typer.val("");
+			// this timeout is required because the onpaste event is
+			// fired *before* the text is actually pasted
+			setTimeout(function() {
+				typer.consoleInsert(typer.val());
+				typer.val("");
+			}, 0);
+		});
+
+		////////////////////////////////////////////////////////////////////////
+		// Handle key hit before translation
+		// For picking up control characters like up/left/down/right
+
+		typer.keydown(function(e){
+			cancelKeyPress = 0;
+			var keyCode = e.keyCode;
+			// C-c: cancel the execution
+			if(e.ctrlKey && keyCode == 67) {
+				cancelKeyPress = keyCode;
+				cancelExecution();
+				return false;
+			}
+			if (acceptInput) {
+				if (e.shiftKey && keyCode in shiftCodes) {
+					cancelKeyPress = keyCode;
+					(shiftCodes[keyCode])();
+					return false;
+				} else if (e.altKey  && keyCode in altCodes) {
+					cancelKeyPress = keyCode;
+					(altCodes[keyCode])();
+					return false;
+				} else if (e.ctrlKey && keyCode in ctrlCodes) {
+					cancelKeyPress = keyCode;
+					(ctrlCodes[keyCode])();
+					return false;
+				} else if (keyCode in keyCodes) {
+					cancelKeyPress = keyCode;
+					(keyCodes[keyCode])();
+					return false;
+				}
+			}
+		});
+
+		////////////////////////////////////////////////////////////////////////
+		// Handle key press
+		typer.keypress(function(e){
+			var keyCode = e.keyCode || e.which;
+			if (isIgnorableKey(e)) {
+				return false;
+			}
+			// C-v: don't insert on paste event
+			if ((e.ctrlKey || e.metaKey) && String.fromCharCode(keyCode).toLowerCase() == 'v') {
+				return true;
+			}
+			if (acceptInput && cancelKeyPress != keyCode && keyCode >= 32){
+				if (cancelKeyPress) return false;
+				if (
+					typeof config.charInsertTrigger == 'undefined' || (
+						typeof config.charInsertTrigger == 'function' &&
+						config.charInsertTrigger(keyCode,promptText)
+					)
+				){
+					typer.consoleInsert(keyCode);
+				}
+			}
+			if (isWebkit) return false;
+		});
+
+		function isIgnorableKey(e) {
+			// for now just filter alt+tab that we receive on some platforms when
+			// user switches windows (goes away from the browser)
+			return ((e.keyCode == keyCodes.tab || e.keyCode == 192) && e.altKey);
+		};
+
+		////////////////////////////////////////////////////////////////////////
+		// Rotate through the command history
+		function rotateHistory(n){
+			if (history.length == 0) return;
+			ringn += n;
+			if (ringn < 0) ringn = history.length;
+			else if (ringn > history.length) ringn = 0;
+			var prevText = promptText;
+			if (ringn == 0) {
+				promptText = restoreText;
+			} else {
+				promptText = history[ringn - 1];
+			}
+			if (config.historyPreserveColumn) {
+				if (promptText.length < column + 1) {
+					column = promptText.length;
+				} else if (column == 0) {
+					column = promptText.length;
+				}
+			} else {
+				column = promptText.length;
+			}
+			updatePromptDisplay();
+		};
+
+		function previousHistory() {
+			rotateHistory(-1);
+		};
+
+		function nextHistory() {
+			rotateHistory(1);
+		};
+
+		// Add something to the history ring
+		function addToHistory(line){
+			history.push(line);
+			restoreText = '';
+		};
+
+		// Delete the character at the current position
+		function deleteCharAtPos(){
+			if (column < promptText.length){
+				promptText =
+					promptText.substring(0,column) +
+					promptText.substring(column+1);
+				restoreText = promptText;
+				return true;
+			} else return false;
+		};
+
+		function backDelete() {
+			if (moveColumn(-1)){
+				deleteCharAtPos();
+				updatePromptDisplay();
+			}
+		};
+
+		function forwardDelete() {
+			if (deleteCharAtPos()){
+				updatePromptDisplay();
+			}
+		};
+
+		function deleteUntilEnd() {
+			while(deleteCharAtPos()) {
+				updatePromptDisplay();
+			}
+		};
+
+		function deleteNextWord() {
+			// A word is defined within this context as a series of alphanumeric
+			// characters.
+			// Delete up to the next alphanumeric character
+			while(
+				column < promptText.length &&
+				!isCharAlphanumeric(promptText[column])
+			) {
+				deleteCharAtPos();
+				updatePromptDisplay();
+			}
+			// Then, delete until the next non-alphanumeric character
+			while(
+				column < promptText.length &&
+				isCharAlphanumeric(promptText[column])
+			) {
+				deleteCharAtPos();
+				updatePromptDisplay();
+			}
+		};
+		
+		function newLine() {
+			promptText += "\n";
+			moveColumn(1);
+			updatePromptDisplay();
+		};
+
+		////////////////////////////////////////////////////////////////////////
+		// Validate command and trigger it if valid, or show a validation error
+		function commandTrigger() {
+			var line = promptText;
+			if (typeof config.commandValidate == 'function') {
+				var ret = config.commandValidate(line);
+				if (ret == true || ret == false) {
+					if (ret) {
+						handleCommand();
+					}
+				} else {
+					commandResult(ret,"jquery-console-message-error");
+				}
+			} else {
+				handleCommand();
+			}
+		};
+
+		// Scroll to the bottom of the view
+		function scrollToBottom() {
+			var version = jQuery.fn.jquery.split('.');
+			var major = parseInt(version[0]);
+			var minor = parseInt(version[1]);
+			
+			// check if we're using jquery > 1.6
+			if ((major == 1 && minor > 6) || major > 1) {
+				inner.prop({ scrollTop: inner.prop("scrollHeight") });
+			}
+			else {
+				inner.attr({ scrollTop: inner.attr("scrollHeight") });
+			}
+		};
+
+		function cancelExecution() {
+			if(typeof config.cancelHandle == 'function') {
+			config.cancelHandle();
+			}
 		}
-	    }
-        });
-
-        ////////////////////////////////////////////////////////////////////////
-        // Handle key press
-        typer.keypress(function(e){
-            var keyCode = e.keyCode || e.which;
-            if (isIgnorableKey(e)) {
-                return false;
-            }
-          // // C-v: don't insert on paste event
-            if ((e.ctrlKey || e.metaKey) && String.fromCharCode(keyCode).toLowerCase() == 'v') {
-              return true;
-            }
-            if (acceptInput && cancelKeyPress != keyCode && keyCode >= 32){
-                if (cancelKeyPress) return false;
-                if (typeof config.charInsertTrigger == 'undefined' ||
-                    (typeof config.charInsertTrigger == 'function' &&
-                     config.charInsertTrigger(keyCode,promptText)))
-                    typer.consoleInsert(keyCode);
-            }
-            if ($.browser.webkit) return false;
-        });
-
-        function isIgnorableKey(e) {
-            // for now just filter alt+tab that we receive on some platforms when
-            // user switches windows (goes away from the browser)
-            return ((e.keyCode == keyCodes.tab || e.keyCode == 192) && e.altKey);
-        };
-
-        ////////////////////////////////////////////////////////////////////////
-        // Rotate through the command history
-        function rotateHistory(n){
-            if (history.length == 0) return;
-            ringn += n;
-            if (ringn < 0) ringn = history.length;
-            else if (ringn > history.length) ringn = 0;
-            var prevText = promptText;
-            if (ringn == 0) {
-                promptText = restoreText;
-            } else {
-                promptText = history[ringn - 1];
-            }
-            if (config.historyPreserveColumn) {
-                if (promptText.length < column + 1) {
-                    column = promptText.length;
-                } else if (column == 0) {
-                    column = promptText.length;
-                }
-            } else {
-                column = promptText.length;
-            }
-            updatePromptDisplay();
-        };
-
-	function previousHistory() {
-	    rotateHistory(-1);
-	};
-
-	function nextHistory() {
-	    rotateHistory(1);
-	};
-
-        // Add something to the history ring
-        function addToHistory(line){
-            history.push(line);
-            restoreText = '';
-        };
-
-        // Delete the character at the current position
-        function deleteCharAtPos(){
-            if (column < promptText.length){
-                promptText =
-                    promptText.substring(0,column) +
-                    promptText.substring(column+1);
-                restoreText = promptText;
-                return true;
-            } else return false;
-        };
-
-	function backDelete() {
-            if (moveColumn(-1)){
-                deleteCharAtPos();
-                updatePromptDisplay();
-            }
-	};
-
-	function forwardDelete() {
-            if (deleteCharAtPos())
-                updatePromptDisplay();
-	};
-
-	function deleteUntilEnd() {
-	    while(deleteCharAtPos()) {
-		updatePromptDisplay();
-	    }
-	};
-
-	function deleteNextWord() {
-	    // A word is defined within this context as a series of alphanumeric
-	    // characters.
-	    // Delete up to the next alphanumeric character
-	    while(column < promptText.length &&
-		  !isCharAlphanumeric(promptText[column])) {
-		deleteCharAtPos();
-		updatePromptDisplay();
-	    }
-	    // Then, delete until the next non-alphanumeric character
-	    while(column < promptText.length &&
-		  isCharAlphanumeric(promptText[column])) {
-		deleteCharAtPos();
-		updatePromptDisplay();
-	    }
-	};
-
-        ////////////////////////////////////////////////////////////////////////
-        // Validate command and trigger it if valid, or show a validation error
-        function commandTrigger() {
-            var line = promptText;
-            if (typeof config.commandValidate == 'function') {
-                var ret = config.commandValidate(line);
-                if (ret == true || ret == false) {
-                    if (ret) {
-                        handleCommand();
-                    }
-                } else {
-                    commandResult(ret,"jquery-console-message-error");
-                }
-            } else {
-                handleCommand();
-            }
-        };
-
-        // Scroll to the bottom of the view
-        function scrollToBottom() {
-            if (jQuery.fn.jquery > "1.6") {
-                inner.prop({ scrollTop: inner.prop("scrollHeight") });
-            }
-            else {
-                inner.attr({ scrollTop: inner.attr("scrollHeight") });
-            }
-        };
-
-	function cancelExecution() {
-	    if(typeof config.cancelHandle == 'function') {
-		config.cancelHandle();
-	    }
-	}
-
-        ////////////////////////////////////////////////////////////////////////
-        // Handle a command
-        function handleCommand() {
-            if (typeof config.commandHandle == 'function') {
-		disableInput();
-                addToHistory(promptText);
-                var text = promptText;
-                if (extern.continuedPrompt) {
-                  if (continuedText)
-                    continuedText += '\n' + promptText;
-                  else continuedText = promptText;
-                } else continuedText = undefined;
-                if (continuedText) text = continuedText;
-                var ret = config.commandHandle(text,function(msgs){
-                    commandResult(msgs);
-                });
-                if (extern.continuedPrompt && !continuedText)
-                  continuedText = promptText;
-                if (typeof ret == 'boolean') {
-                    if (ret) {
-                        // Command succeeded without a result.
-                        commandResult();
-                    } else {
-                        commandResult('Command failed.',
-                                      "jquery-console-message-error");
-                    }
-                } else if (typeof ret == "string") {
-                    commandResult(ret,"jquery-console-message-success");
-                } else if (typeof ret == 'object' && ret.length) {
-                    commandResult(ret);
-                } else if (extern.continuedPrompt) {
-                    commandResult();
-                }
-            }
-        };
-
-        ////////////////////////////////////////////////////////////////////////
-        // Disable input
-	function disableInput() {
-	    acceptInput = false;
-	};
-
-        // Enable input
-	function enableInput() {
-	    acceptInput = true;
-	}
-
-        ////////////////////////////////////////////////////////////////////////
-        // Reset the prompt in invalid command
-        function commandResult(msg,className) {
-            column = -1;
-            updatePromptDisplay();
-            if (typeof msg == 'string') {
-                message(msg,className);
-            } else if ($.isArray(msg)) {
-                for (var x in msg) {
-                    var ret = msg[x];
-                    message(ret.msg,ret.className);
-                }
-            } else { // Assume it's a DOM node or jQuery object.
-              inner.append(msg);
-            }
-            newPromptBox();
-        };
-
-        ////////////////////////////////////////////////////////////////////////
-        // Display a message
-        function message(msg,className) {
-            var mesg = $('<div class="jquery-console-message"></div>');
-            if (className) mesg.addClass(className);
-            mesg.filledText(msg).hide();
-            inner.append(mesg);
-            mesg.show();
-        };
-
-        ////////////////////////////////////////////////////////////////////////
-        // Handle normal character insertion
-        // data can either be a number, which will be interpreted as the
-        // numeric value of a single character, or a string
-        typer.consoleInsert = function(data){
-            // TODO: remove redundant indirection
-            var text = isNaN(data) ? data : String.fromCharCode(data);
-            var before = promptText.substring(0,column);
-            var after = promptText.substring(column);
-            promptText = before + text + after;
-            moveColumn(text.length);
-            restoreText = promptText;
-            updatePromptDisplay();
-        };
-
-        ////////////////////////////////////////////////////////////////////////
-        // Move to another column relative to this one
-        // Negative means go back, positive means go forward.
-        function moveColumn(n){
-            if (column + n >= 0 && column + n <= promptText.length){
-                column += n;
-                return true;
-            } else return false;
-        };
-
-	function moveForward() {
-            if(moveColumn(1)) {
-		updatePromptDisplay();
-		return true;
-	    }
-	    return false;
-	};
-
-	function moveBackward() {
-            if(moveColumn(-1)) {
-		updatePromptDisplay();
-		return true;
-	    }
-	    return false;
-	};
 
-	function moveToStart() {
-            if (moveColumn(-column))
-                updatePromptDisplay();
-	};
-
-	function moveToEnd() {
-            if (moveColumn(promptText.length-column))
-                updatePromptDisplay();
-	};
+		////////////////////////////////////////////////////////////////////////
+		// Handle a command
+		function handleCommand() {
+			if (typeof config.commandHandle == 'function') {
+				disableInput();
+				addToHistory(promptText);
+				var text = promptText;
+				if (extern.continuedPrompt) {
+					if (continuedText)
+						continuedText += '\n' + promptText;
+					else continuedText = promptText;
+				} else continuedText = undefined;
+				if (continuedText) text = continuedText;
+				var ret = config.commandHandle(text,function(msgs){
+					commandResult(msgs);
+				});
+				if (extern.continuedPrompt && !continuedText)
+					continuedText = promptText;
+				if (typeof ret == 'boolean') {
+					if (ret) {
+						// Command succeeded without a result.
+						commandResult();
+					} else {
+						commandResult(
+							'Command failed.',
+							"jquery-console-message-error"
+						);
+					}
+				} else if (typeof ret == "string") {
+					commandResult(ret,"jquery-console-message-success");
+				} else if (typeof ret == 'object' && ret.length) {
+					commandResult(ret);
+				} else if (extern.continuedPrompt) {
+					commandResult();
+				}
+			}
+		};
+
+		////////////////////////////////////////////////////////////////////////
+		// Disable input
+		function disableInput() {
+			acceptInput = false;
+		};
+
+		// Enable input
+		function enableInput() {
+			acceptInput = true;
+		}
 
-	function moveToNextWord() {
-	    while(column < promptText.length &&
-		  !isCharAlphanumeric(promptText[column]) &&
-		  moveForward()) {
-	    }
-	    while(column < promptText.length &&
-		  isCharAlphanumeric(promptText[column]) &&
-		  moveForward()) {
-	    }
+		////////////////////////////////////////////////////////////////////////
+		// Reset the prompt in invalid command
+		function commandResult(msg,className) {
+			column = -1;
+			updatePromptDisplay();
+			if (typeof msg == 'string') {
+				message(msg,className);
+			} else if ($.isArray(msg)) {
+				for (var x in msg) {
+					var ret = msg[x];
+					message(ret.msg,ret.className);
+				}
+			} else { // Assume it's a DOM node or jQuery object.
+				inner.append(msg);
+			}
+			newPromptBox();
+		};
+
+		////////////////////////////////////////////////////////////////////////
+		// Display a message
+		function message(msg,className) {
+			var mesg = $('<div class="jquery-console-message"></div>');
+			if (className) mesg.addClass(className);
+			mesg.filledText(msg).hide();
+			inner.append(mesg);
+			mesg.show();
+		};
+
+		////////////////////////////////////////////////////////////////////////
+		// Handle normal character insertion
+		// data can either be a number, which will be interpreted as the
+		// numeric value of a single character, or a string
+		typer.consoleInsert = function(data){
+			// TODO: remove redundant indirection
+			var text = isNaN(data) ? data : String.fromCharCode(data);
+			var before = promptText.substring(0,column);
+			var after = promptText.substring(column);
+			promptText = before + text + after;
+			moveColumn(text.length);
+			restoreText = promptText;
+			updatePromptDisplay();
+		};
+
+		////////////////////////////////////////////////////////////////////////
+		// Move to another column relative to this one
+		// Negative means go back, positive means go forward.
+		function moveColumn(n){
+			if (column + n >= 0 && column + n <= promptText.length){
+				column += n;
+				return true;
+			} else return false;
+		};
+
+		function moveForward() {
+			if(moveColumn(1)) {
+				updatePromptDisplay();
+				return true;
+			}
+			return false;
+		};
+
+		function moveBackward() {
+			if(moveColumn(-1)) {
+				updatePromptDisplay();
+				return true;
+			}
+			return false;
+		};
+
+		function moveToStart() {
+			if (moveColumn(-column))
+				updatePromptDisplay();
+		};
+
+		function moveToEnd() {
+			if (moveColumn(promptText.length-column))
+				updatePromptDisplay();
+		};
+
+		function moveToNextWord() {
+			while(
+				column < promptText.length &&
+				!isCharAlphanumeric(promptText[column]) &&
+				moveForward()
+			) {}
+			while(
+				column < promptText.length &&
+				isCharAlphanumeric(promptText[column]) &&
+				moveForward()
+			) {}
+		};
+
+		function moveToPreviousWord() {
+			// Move backward until we find the first alphanumeric
+			while(
+				column -1 >= 0 &&
+				!isCharAlphanumeric(promptText[column-1]) &&
+				moveBackward()
+			) {}
+			// Move until we find the first non-alphanumeric
+			while(
+				column -1 >= 0 &&
+				isCharAlphanumeric(promptText[column-1]) &&
+				moveBackward()
+			) {}
+		};
+
+		function isCharAlphanumeric(charToTest) {
+			if(typeof charToTest == 'string') {
+				var code = charToTest.charCodeAt();
+				return (code >= 'A'.charCodeAt() && code <= 'Z'.charCodeAt()) ||
+					(code >= 'a'.charCodeAt() && code <= 'z'.charCodeAt()) ||
+					(code >= '0'.charCodeAt() && code <= '9'.charCodeAt());
+			}
+			return false;
+		};
+
+		function doComplete() {
+			if(typeof config.completeHandle == 'function') {
+				var completions = config.completeHandle(promptText);
+				var len = completions.length;
+				if (len === 1) {
+					extern.promptText(promptText + completions[0]);
+				} else if (len > 1 && config.cols) {
+					var prompt = promptText;
+					// Compute the number of rows that will fit in the width
+					var max = 0;
+					for (var i = 0;i < len;i++) {
+						max = Math.max(max, completions[i].length);
+					}
+					max += 2;
+					var n = Math.floor(config.cols / max);
+					var buffer = "";
+					var col = 0;
+					for (i = 0;i < len;i++) {
+						var completion = completions[i];
+						buffer += completions[i];
+						for (var j = completion.length;j < max;j++) {
+							buffer += " ";
+						}
+						if (++col >= n) {
+							buffer += "\n";
+							col = 0;
+						}
+					}
+					commandResult(buffer,"jquery-console-message-value");
+					extern.promptText(prompt);
+				}
+			}
+		};
+
+		function doNothing() {};
+
+		extern.promptText = function(text){
+			if (typeof text === 'string') {
+				promptText = text;
+				column = promptText.length;
+				updatePromptDisplay();
+			}
+			return promptText;
+		};
+
+		////////////////////////////////////////////////////////////////////////
+		// Update the prompt display
+		function updatePromptDisplay(){
+			var line = promptText;
+			var html = '';
+			if (column > 0 && line == ''){
+				// When we have an empty line just display a cursor.
+				html = cursor;
+			} else if (column == promptText.length){
+				// We're at the end of the line, so we need to display
+				// the text *and* cursor.
+				html = htmlEncode(line) + cursor;
+			} else {
+				// Grab the current character, if there is one, and
+				// make it the current cursor.
+				var before = line.substring(0, column);
+				var current = line.substring(column,column+1);
+				if (current){
+					current =
+						'<span class="jquery-console-cursor">' +
+						htmlEncode(current) +
+						'</span>';
+				}
+				var after = line.substring(column+1);
+				html = htmlEncode(before) + current + htmlEncode(after);
+			}
+			prompt.html(html);
+			scrollToBottom();
+		};
+
+		// Simple HTML encoding
+		// Simply replace '<', '>' and '&'
+		// TODO: Use jQuery's .html() trick, or grab a proper, fast
+		// HTML encoder.
+		function htmlEncode(text){
+			return (
+				text.replace(/&/g,'&amp;')
+					.replace(/</g,'&lt;')
+					.replace(/</g,'&lt;')
+					.replace(/ /g,'&nbsp;')
+					.replace(/\n/g,'<br />')
+			);
+		};
+
+		return extern;
 	};
-
-	function moveToPreviousWord() {
-	    // Move backward until we find the first alphanumeric
-	    while(column -1 >= 0 &&
-		  !isCharAlphanumeric(promptText[column-1]) &&
-		  moveBackward()) {
-	    }
-	    // Move until we find the first non-alphanumeric
-	    while(column -1 >= 0 &&
-		  isCharAlphanumeric(promptText[column-1]) &&
-		  moveBackward()) {
-	    }
+	// Simple utility for printing messages
+	$.fn.filledText = function(txt){
+		$(this).text(txt);
+		$(this).html($(this).html().replace(/\n/g,'<br/>'));
+		return this;
 	};
 
-	function isCharAlphanumeric(charToTest) {
-	    if(typeof charToTest == 'string') {
-		var code = charToTest.charCodeAt();
-		return (code >= 'A'.charCodeAt() && code <= 'Z'.charCodeAt()) ||
-		    (code >= 'a'.charCodeAt() && code <= 'z'.charCodeAt()) ||
-		    (code >= '0'.charCodeAt() && code <= '9'.charCodeAt());
-	    }
-	    return false;
+	// Alternative method for focus without scrolling
+	$.fn.focusWithoutScrolling = function(){
+		var x = window.scrollX, y = window.scrollY;
+		$(this).focus();
+		window.scrollTo(x, y);
 	};
-
-	function doNothing() {};
-
-        extern.promptText = function(text){
-            if (text) {
-                promptText = text;
-                column = promptText.length;
-                updatePromptDisplay();
-            }
-            return promptText;
-        };
-
-        ////////////////////////////////////////////////////////////////////////
-        // Update the prompt display
-        function updatePromptDisplay(){
-            var line = promptText;
-            var html = '';
-            if (column > 0 && line == ''){
-                // When we have an empty line just display a cursor.
-                html = cursor;
-            } else if (column == promptText.length){
-                // We're at the end of the line, so we need to display
-                // the text *and* cursor.
-                html = htmlEncode(line) + cursor;
-            } else {
-                // Grab the current character, if there is one, and
-                // make it the current cursor.
-                var before = line.substring(0, column);
-                var current = line.substring(column,column+1);
-                if (current){
-                    current =
-                        '<span class="jquery-console-cursor">' +
-                        htmlEncode(current) +
-                        '</span>';
-                }
-                var after = line.substring(column+1);
-                html = htmlEncode(before) + current + htmlEncode(after);
-            }
-            prompt.html(html);
-            scrollToBottom();
-        };
-
-        // Simple HTML encoding
-        // Simply replace '<', '>' and '&'
-        // TODO: Use jQuery's .html() trick, or grab a proper, fast
-        // HTML encoder.
-        function htmlEncode(text){
-            return (
-                text.replace(/&/g,'&amp;')
-                    .replace(/</g,'&lt;')
-                    .replace(/</g,'&lt;')
-                    .replace(/ /g,'&nbsp;')
-                    .replace(/\n/g,'<br />')
-            );
-        };
-
-        return extern;
-    };
-    // Simple utility for printing messages
-    $.fn.filledText = function(txt){
-        $(this).text(txt);
-        $(this).html($(this).html().replace(/\n/g,'<br/>'));
-        return this;
-    };
 })(jQuery);
diff --git a/resources/public/javascript/tryclojure.js b/resources/public/javascript/tryclojure.js
index 4e04303..c6069fc 100644
--- a/resources/public/javascript/tryclojure.js
+++ b/resources/public/javascript/tryclojure.js
@@ -1,6 +1,19 @@
-var pageNum = -1;
-var page = null;
+var currentPage = -1;
 var pages = [
+			"page1",
+			"page2",
+			"page3",
+			"page4",
+			"page5",
+			"page6",
+			"page7",
+			"page8",
+			"page9",
+			"page10",
+			"page11",
+			"end"
+		];
+var pageExitConditions = [
     {
         verify: function(data) { return false; }
     },
@@ -31,25 +44,28 @@ var pages = [
     {
         verify: function (data) { return data.expr == "(map inc [1 2 3 4])"; }
     },
+    {
+        verify: function (data) { return false; }
+    },
     {
         verify: function (data) { return false; }
     }
 ];
 
-function showPage(n) {
-    var res = pages[n];
-    if (res) {
-        pageNum = n;
-        page = res;
-
-        var block = $("#changer");
-        block.fadeOut(function(e) {
-            block.load("/tutorial", { 'n' : n+1 }, function() {
-                block.fadeIn();
-                changerUpdated();
-            });
-        });
-    }
+function goToPage(pageNumber) {
+	if (pageNumber == currentPage || pageNumber < 0 || pageNumber >= pages.length) {
+			return;
+	}
+
+	currentPage = pageNumber;
+
+	var block = $("#changer");
+  	block.fadeOut(function(e) {
+    	block.load("/tutorial", { 'page' : pages[pageNumber] }, function() {
+      block.fadeIn();
+      changerUpdated();
+		});
+	});
 }
 
 function setupLink(url) {
@@ -85,36 +101,28 @@ function html_escape(val) {
     return result;
 }
 
-function doCommand(input, report) {
-    switch (input) {
-    case 'tutorial':
-        showPage(0);
-        report();
-        return true;
-    case 'back':
-        if (pageNum > 0) {
-            showPage(pageNum - 1);
-            report();
-            return true;
-        } else {
-            return false;
-        }
-    case 'next':
-        if (pageNum >= 0 && pageNum < pages.length - 1) {
-            showPage(pageNum + 1);
-            report();
-            return true;
-        } else {
-            return false;
-        }
+function doCommand(input) {
+		if (input.match(/^gopage /)) {
+				goToPage(parseInt(input.substring("gopage ".length)));
+				return true;
+		}
+
+		switch (input) {
+	  case 'next':
+	  case 'forward':
+    		goToPage(currentPage + 1);
+				return true;
+		case 'previous':
+		case 'prev':
+		case 'back':
+    		goToPage(currentPage - 1);
+				return true;
     case 'restart':
-        if (pageNum > 0) {
-            showPage(0);
-            report();
-            return true;
-        } else {
-            return false;
-        }
+    case 'reset':
+    case 'home':
+    case 'quit':
+    		goToPage(0);
+      	return true;
     default:
         return false;
     }
@@ -128,7 +136,10 @@ function onHandle(line, report) {
     var input = $.trim(line);
 
     // handle commands
-    if (doCommand(input, report)) return;
+    if (doCommand(input)) {
+			report();
+			return;
+		}
 
     // perform evaluation
     var data = eval_clojure(input);
@@ -139,8 +150,8 @@ function onHandle(line, report) {
     }
 
     // handle page
-    if (page && page.verify(data)) {
-        showPage(pageNum + 1);
+    if (currentPage >= 0 && pageExitConditions[currentPage].verify(data)) {
+  			goToPage(currentPage + 1);
     }
 
     // display expr results
@@ -166,8 +177,8 @@ var controller;
 
 $(document).ready(function() {
     controller = $("#console").console({
-        welcomeMessage:'Enter some Clojure code to be evaluated.',
-        promptLabel: 'Clojure> ',
+        welcomeMessage:'Give me some Clojure:',
+        promptLabel: '> ',
         commandValidate: onValidate,
         commandHandle: onHandle,
         autofocus:true,
diff --git a/resources/public/tutorial/end.html b/resources/public/tutorial/end.html
new file mode 100644
index 0000000..f85f040
--- /dev/null
+++ b/resources/public/tutorial/end.html
@@ -0,0 +1,7 @@
+<p>
+  Glad to know you're eager for more, but unfortunately this tutorial is over.
+</p>
+
+<p>
+  Maybe you can click the 'links' button above for more resources?
+</p>
diff --git a/resources/public/tutorial/page1.html b/resources/public/tutorial/page1.html
index 7ffd325..4654fcb 100644
--- a/resources/public/tutorial/page1.html
+++ b/resources/public/tutorial/page1.html
@@ -1,15 +1,7 @@
 <p>
-  This tutorial isn't entirely complete yet. More fun content is to be written. Stay tuned.
+  I'll take you on a 5-minutes tour of Clojure, but feel free to experiment on your own along the road!
 </p>
 
 <p>
-  Above, you have your REPL. Please try the examples as we go along, and by all means experiment
-  with concepts independently. Should you refuse, you will promptly be IP banned from this
-  website, and a teddy bear will eat your candies. ctrl+v to paste and ctrl+c to copy like you
-  would normally expect, but you can't paste with your browser's right-click menu.
-</p>
-
-<p>
-  You can type 'next' to move forward, 'back' to go back to the previous step, and 'restart' to
-  restart the tutorial. Go ahead and type 'next' to begin
+  You can type <code>next</code> to skip forward, <code>back</code> to return to the previous step, and <code>restart</code> to get back to the beginning. Let's get started: type <code>next</code>.
 </p>
diff --git a/resources/public/tutorial/page10.html b/resources/public/tutorial/page10.html
index f19c97b..f1e2228 100644
--- a/resources/public/tutorial/page10.html
+++ b/resources/public/tutorial/page10.html
@@ -1,30 +1,35 @@
-<p>Awesome. Now you can call this function just like we called the old square function.</p>
+<p>
+  Success! Now you can call this new <code>square</code> function just like you called the old <code>square</code> function.
+</p>
 
 <p>
-  Clojure has a great set of immutable and persistent data structures. Vectors, lists, maps, sets,
-  I get chills.
+  By now, you know that lists are quite important in Clojure.
+  But Clojure also has other data structures:
 </p>
 
 <p>
   Vectors: <code class="expr">[1 2 3 4]</code><br/>
   Maps: <code class="expr">{:foo "bar" 3 4}</code><br/>
-  Lists: <code class="expr">'(1 2 3 4)</code><br/>
   Sets: <code class="expr">#{1 2 3 4}</code><br/>
-  Vectors and lists are sequential and ordered collections. You'll see vectors used much more than lists.
-  Maps are typical hash-maps - unordered collections indexed by keys. The keys can be any object. Here,
-  we've used a keyword, <code>:foo</code> as a key. Keywords make excellent keys. We also used a number.
-  Sets are mathematical sets.
 </p>
 
 <p>
-  Clojure's collections are one of the most imporant parts of Clojure. Being a functional language, Clojure
-  encourages immutability and as little state as possible. Therefore, instead of for loops mutating variables
-  and such, most of the time you'll see higher order functions doing transformations on immutable data and
-  returning new collections rather than ever modifying the old one.
+  Vectors and lists are sequential and ordered collections.
+  Sets are not ordered, and they cannot contain duplicate elements.
+  Maps are key-value collections, where the keys can be any object.
+  Here, we've used what Clojure calls a <em>keyword</em> (<code>:foo</code>) for one of the keys, and a number for the other key.
+</p>
+
+<p>
+  Now I'll tell you another thing that may surprise you: Clojure collections are <em>immutable</em> - they can never change.
+  When you do anything on a list, including adding and removing elements, you actually get a brand new list.
+  (Fortunately, Clojure is amazingly efficient at creating new lists).
+  In general, Clojure encourages you to have as little mutable state as possible.
+  For example, instead of "for" loops and other state-changing constructs, most of the time you'll see functions doing transformations on immutable data and returning new collections, without changing the old one.
 </p>
 
 <p>
-  A prime example of this is <code>map</code>. We can use map, a higher order function (which is a function
-  that takes functions as arguments or returns functions), to 'map' a function to every element of a sequence.
-  Let's use this to increment each number in a vector. Type <code class="expr">(map inc [1 2 3 4])</code> to continue.
+  A prime example of this is <code>map</code>. <code>map</code> is a <em>higher order function</em>, which means that it takes another function as an argument.
+  For example, you can ask <code>map</code> to increment each number in a vector by passing it the <code>inc</code> function, followed by the vector.
+  Try it for yourself: type <code class="expr">(map inc [1 2 3 4])</code> to continue.
 </p>
diff --git a/resources/public/tutorial/page11.html b/resources/public/tutorial/page11.html
index da67d0a..726fe3c 100644
--- a/resources/public/tutorial/page11.html
+++ b/resources/public/tutorial/page11.html
@@ -1,8 +1,11 @@
-<p>Excellent work.</p>
+<p>Great job!</p>
 
 <p>
-  Well, that's all there is right now. This tutorial is still a work in progress, and I'm working on more
-  steps. If anybody wants to contribute, you can find a link to the Github repository on the 'about' page.
-  Furthermore, if you're just a brand new Clojure developer looking for some learning experiences, check
-  out the 'links' page. You'll find links to some tutorials and such there.
+  We've only scratched the surface of Clojure and its mind-bending power.
+  This tutorial is still a work in progress, and I'm working on more steps.
+  Meanwhile, you can learn more about Clojure by visiting the 'links' page.
+</p>
+
+<p>
+  Welcome to your adventures in Clojure, and be prepared to be surprised and delighted every step of the way!
 </p>
diff --git a/resources/public/tutorial/page2.html b/resources/public/tutorial/page2.html
index acd317f..1d11c62 100644
--- a/resources/public/tutorial/page2.html
+++ b/resources/public/tutorial/page2.html
@@ -1,6 +1,7 @@
 <p>
-  I bet you're curious to find out what Clojure code looks like, aren't you? Sure you are.
-  Well, I've give you a hint: it's made up of lists. Let's do some arithmetic.
+  The first thing you may notice about Clojure is that common operations look... strange.
 </p>
 
-<code class="expr">(+ 3 3)</code>
+<p>
+  For example, try typing <code class="expr">(+ 3 3)</code> in the REPL.
+</p>
diff --git a/resources/public/tutorial/page3.html b/resources/public/tutorial/page3.html
index 925f30e..ae8cc9b 100644
--- a/resources/public/tutorial/page3.html
+++ b/resources/public/tutorial/page3.html
@@ -1,12 +1,13 @@
 <p>
-  Excellent work! There are other arithmetic functions.
+  That was a strange way to say "three plus three", wasn't it?
 </p>
-<code>*</code>
-<code>-</code>
-<code>/</code>
 
 <p>
-  Try them out. Save <code>/</code> for last (don't worry, I have a reason!).
+  A Clojure program is made of <em>lists</em>.
+  <code class="expr">(+ 3 3)</code> is a list that contains an operator, and then the operands.
+  Try out the same concept with the <code>*</code> and <code>-</code> operators.
 </p>
 
-<p>Once you're finished playing around, try <code class="expr">(/ 10 3)</code>.</p>
+<p>
+  Division might surprise you. When you're ready to move forward, try <code class="expr">(/ 10 3)</code>.
+</p>
diff --git a/resources/public/tutorial/page4.html b/resources/public/tutorial/page4.html
index 0d06d50..991dc20 100644
--- a/resources/public/tutorial/page4.html
+++ b/resources/public/tutorial/page4.html
@@ -1,8 +1,4 @@
 <p>
-  I bet that caught you by surprise, didn't it? Don't fear! Clojure simply has a built in Rational type.
-  We can prove that we've got a rational by running <code class="expr">(type (/ 10 3))</code>. Rationals are more
-  concise and precise than floating point numbers. However, we can force Clojure to do floating point
-  division by just making one of our numbers floating point.
+  Now, that was a bit surprising: Clojure has a built in Rational type.
+  You can still force Clojure to do floating point division by making one of the operands floating point: type <code class="expr">(/ 10 3.0)</code> to continue.
 </p>
-
-<p>Type <code class="expr">(/ 10 3.0)</code> to continue.</p>
diff --git a/resources/public/tutorial/page5.html b/resources/public/tutorial/page5.html
index 5f40ebb..1788c09 100644
--- a/resources/public/tutorial/page5.html
+++ b/resources/public/tutorial/page5.html
@@ -1,11 +1,6 @@
 <p>Awesome!</p>
 
 <p>
-  Another neat thing about Clojure is that functions can take an arbitrary number of arguments.
-  Functions are allowed to specify a 'catch-all' to put an optional and arbitrary number of arguments
-  into. Because of this, a lot of Clojure's core functions have interesting capabilities. For example
-  the arithmetic functions we've already played with are not limited to two arguments! No sir, they can
-  take any number of arguments they wish.
+  Many Clojure functions can take an arbitrary number of arguments.
+  Try it out: type <code class="expr">(+ 1 2 3 4 5 6)</code> to continue.
 </p>
-
-<p>Try it out. Type <code class="expr">(+ 1 2 3 4 5 6)</code> to continue.</p>
diff --git a/resources/public/tutorial/page6.html b/resources/public/tutorial/page6.html
index 0b55ee3..daa7698 100644
--- a/resources/public/tutorial/page6.html
+++ b/resources/public/tutorial/page6.html
@@ -1,7 +1,8 @@
-<p>Alright, that's enough math. Let's do some fun stuff, like write functions.</p>
-
 <p>
-  You can define functions in Clojure with <code>defn</code>
+  That's enough math. Let's do some fun stuff, like defining functions.
+  You can do that in Clojure with <code>defn</code>.
 </p>
 
-<p>Type <code class="expr">(defn square [x] (* x x))</code> to continue!</p>
+<p>
+  Type <code class="expr">(defn square [x] (* x x))</code> to define a "square" function that takes a single number and squares it.
+</p>
diff --git a/resources/public/tutorial/page7.html b/resources/public/tutorial/page7.html
index cf0f574..e6c58c0 100644
--- a/resources/public/tutorial/page7.html
+++ b/resources/public/tutorial/page7.html
@@ -1,12 +1,13 @@
-<p>Oh boy! We wrote our very own function! It's a lovely one, isn't it?</p>
+<p>Congratulations - you just defined your first Clojure function. Many more will follow!</p>
 
 <p>
-  Our <code>square</code> function takes a single argument -- a number -- and squares it.
+  <code>defn</code> takes the name of the function, then the list of arguments, and then the body of the function.
+  I told you that a Clojure program is made of lists, right?
+  The entire <code>defn</code> is a list, and the function body is also a list.
+  (Even the arguments are collected in a vector, which is similar to a list - we'll talk about vectors soon).
 </p>
 
 <p>
-  Take a look at how our defn form looks. First comes the name of the function, then the argument list
-  (which is a vector, and not an actual list), then the body of the function.
+  Oh, sorry for talking so long - you probably want to try out your brand new function!
+  Type <code class="expr">(square 10)</code>.
 </p>
-
-<p>But wait! We don't even know if our function works or not! Let's try it out. Type <code class="expr">(square 10)</code>.</p>
diff --git a/resources/public/tutorial/page8.html b/resources/public/tutorial/page8.html
index 075857f..d3a26cf 100644
--- a/resources/public/tutorial/page8.html
+++ b/resources/public/tutorial/page8.html
@@ -1,17 +1,20 @@
 <p>Yay! It works!</p>
 
 <p>
-  You know, Clojure is a functional programming language. As such, it has first-class and
-  anonymous functions. Let's write our square function as an anonymous function.
+  By now, you probably think that Clojure is very different from the programming languages you already know.
+  Indeed, it belongs to a different family than most popular languages' - the family of "functional" programming languages.
+  Like most functional languages, Clojure can define a function without even giving it a name:
 </p>
+
 <code class="expr">(fn [x] (* x x))</code>
+
 <p>
-  If you run this in the REPL above (as you should), you'll note that some very weird and
-  cryptic thing is printed. Functions are just normal values like a number, a string, or
-  anything else. The cryptic thing is simply how they look when printed.
+  If you run this code, you'll see some cryptic output.
+  In Clojure, functions are just normal values like numbers or strings.
+  <code>fn</code> defines a function and then returns it.
+  What you're seeing is simply what a function looks like when you print it on the screen.
 </p>
 
 <p>
-  Our anonymous function isn't very useful if we don't call it. Let's do it. Type 
-  <code class="expr">((fn [x] (* x x)) 10)</code>
+  But wait - an anonymous function isn't very useful if you can't call it. Try to define a new anonymous function and call it straight away: <code class="expr">((fn [x] (* x x)) 10)</code>.
 </p>
diff --git a/resources/public/tutorial/page9.html b/resources/public/tutorial/page9.html
index d6e81da..44e17cc 100644
--- a/resources/public/tutorial/page9.html
+++ b/resources/public/tutorial/page9.html
@@ -1,12 +1,16 @@
 <p>
-  Yay! Notice how we called our anonymous function? We just wrapped the function in parentheses,
-  placing it as the first element in this new list and passing it arguments just like we did earlier
-  with the arithmetic functions. Awesome, huh?
+  Let's see what you just did: you evaluated a list where the first element is the function itself, defined on the spot - and the other elements are the arguments that you pass to the function.
+  That's exactly the same syntax that you used earlier on to call functions like <code>square</code> or even <code>+</code>.
+  The only difference is that now you defined the function in the same place where you called it.
 </p>
 
 <p>
-  You may not know this, but <code>defn</code> is actually just a bit of sugar around <code>def</code>
-  and <code>fn</code> to create named functions. We can create named functions without <code>defn</code>
+  Remember <code>defn</code>?
+  Now I can tell you a secret: <code>defn</code> is actually just a bit of syntactic sugar around <code>def</code> and <code>fn</code>.
+  You've just seen <code>fn</code> at work: it defines a new function.
+  <code>def</code> binds the newly defined function to a name.
 </p>
 
-<p>Type <code class="expr">(def square (fn [x] (* x x)))</code> to continue.</p>
+<p>
+   If you want, you can create a named function without using <code>defn</code>: type <code class="expr">(def square (fn [x] (* x x)))</code> to continue.
+</p>
diff --git a/src/tryclojure/server.clj b/src/tryclojure/server.clj
index 08eeedc..010ce2f 100644
--- a/src/tryclojure/server.clj
+++ b/src/tryclojure/server.clj
@@ -1,18 +1,23 @@
 (ns tryclojure.server
-  (:require [noir.server :as server]
-            [ring.middleware.file :refer [wrap-file]]))
+  (:use compojure.core)
+  (:require [compojure.route :as route]
+            [noir.util.middleware :as nm]
+            [ring.adapter.jetty :as jetty]
+            [tryclojure.views.home :as home]
+            [tryclojure.views.tutorial :as tutorial]
+            [tryclojure.views.eval :as eval]))
 
-(server/add-middleware wrap-file (System/getProperty "user.dir"))
-(server/load-views "src/tryclojure/views")
+(def app-routes
+  [(GET "/" [] (home/root-html))
+   (GET "/about" [] (home/about-html))
+   (GET "/links" [] (home/links-html))
+   (POST "/tutorial" [:as {args :params}] (tutorial/tutorial-html (args :page)))
+   (POST "/eval.json" [:as {args :params}] (eval/eval-json (args :expr) (args :jsonp)))
+   (GET "/eval.json" [:as {args :params}] (eval/eval-json (args :expr) (args :jsonp)))
+   (route/resources "/")
+   (route/not-found "Not Found")])
 
-(defn to-port [s]
-  (when-let [port s] (Long. port)))
+(def app (nm/app-handler app-routes))
 
-(defn tryclj [& [port]]
-  (server/start
-   (or (to-port port)
-       (to-port (System/getenv "PORT")) ;; For deploying to Heroku
-       8801)
-   {:session-cookie-attrs {:max-age 600}}))
-
-(defn -main [& args] (tryclj (first args)))
\ No newline at end of file
+(defn -main [port]
+  (jetty/run-jetty app {:port (Long. port) :join? false}))
diff --git a/src/tryclojure/views/eval.clj b/src/tryclojure/views/eval.clj
index f9d0ff4..a8a312d 100644
--- a/src/tryclojure/views/eval.clj
+++ b/src/tryclojure/views/eval.clj
@@ -1,9 +1,8 @@
 (ns tryclojure.views.eval
-  (:require [noir.core :refer [defpage]]
-            [tryclojure.models.eval :refer [eval-request]]
+  (:require [tryclojure.models.eval :refer [eval-request]]
             [noir.response :as resp]))
 
-(defpage "/eval.json" {:keys [expr jsonp]}
+(defn eval-json [expr jsonp]
   (let [{:keys [expr result error message] :as res} (eval-request expr)
         data (if error
                res
diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj
index 0efeebb..d717b7e 100644
--- a/src/tryclojure/views/home.clj
+++ b/src/tryclojure/views/home.clj
@@ -1,59 +1,56 @@
 (ns tryclojure.views.home
-  (:require [noir.core :refer [defpartial defpage]]
-            [hiccup.element :refer [javascript-tag link-to unordered-list]]
-            [hiccup.page :refer [include-css include-js html5]]))
+  (:require [hiccup.element :refer [javascript-tag link-to unordered-list]]
+            [hiccup.page :refer [include-css include-js html5]]
+            [hiccup.core :refer [html]]))
 
-(defpartial links []
-  (unordered-list
-   [(link-to "http://clojure.org" "The official Clojure website")
-    (link-to "http://dev.clojure.org/display/doc/Getting+Started" "Getting started with Clojure")
-    (link-to "http://groups.google.com/group/clojure" "Clojure mailing list")
-    (link-to "http://java.ociweb.com/mark/clojure/article.html" "A comprehensive Clojure tutorial")
-    (link-to "http://joyofclojure.com/" "The Joy of Clojure: a book by Michael Fogus and Chris Houser")
-    (link-to "http://disclojure.org" "Disclojure")
-    (link-to "http://planet.clojure.in" "Planet Clojure")]))
+(defn links-html []
+  (html
+    (unordered-list
+     [(link-to "http://clojure.org" "The official Clojure website")
+      (link-to "http://clojure-doc.org/" "Clojure tutorials and documentation")
+      (link-to "http://groups.google.com/group/clojure" "Clojure mailing list")
+      (link-to "http://joyofclojure.com/" "The Joy of Clojure: a book by Michael Fogus and Chris Houser")
+      (link-to "http://disclojure.org" "Disclojure")
+      (link-to "http://planet.clojure.in" "Planet Clojure")])))
 
-(defpartial about-html []
-  [:p.bottom
-   "Please note that this REPL is sandboxed, so you wont be able to do everything in it "
-   "that you would in a local unsandboxed REPL. Keep in mind that this site is designed for "
-   "beginners to try out Clojure and not necessarily as a general-purpose server-side REPL."]
-  [:p.bottom
-   "One quirk you might run into is that things you bind with def can sometimes disappear. "
-   "The sandbox wipes defs if you def too many things, so don't be surprised. Furthermore, "
-   "The sandbox will automatically be wiped after 15 minutes and if you evaluate more after that,"
-   "It'll be in an entirely new namespace/sandbox."]
-  [:p.bottom
-   "You can find the site's source and such on its "
-   (link-to "http://github.com/Raynes/tryclojure" "github")
-   " page."]
-  [:p.bottom
-   "TryClojure is written in Clojure and JavaScript (JQuery), powered by "
-   (link-to "https://github.com/flatland/clojail" "clojail")
-   " and Chris Done's "
-   (link-to "https://github.com/chrisdone/jquery-console" "jquery-console")]
-  [:p.bottom "Design by " (link-to "http://apgwoz.com" "Andrew Gwozdziewycz")])
+(defn about-html []
+  (html
+    [:p.bottom
+     "Welcome to Try Clojure - a quick tour of Clojure for absolute beginners."]
+    [:p.bottom
+     "Here is our only disclaimer: this site is an introduction to Clojure, not a generic Clojure REPL. "
+     "You won't be able to do everything in it that you could do in your local interpreter. "
+     "Also, the interpreter deletes the data that you enter if you define too many things, or after 15 minutes."]
+    [:p.bottom
+     "TryClojure is written in Clojure and JavaScript with "
+     (link-to "https://github.com/weavejester/compojure" "Compojure") ", "
+     (link-to "https://github.com/noir-clojure/lib-noir" "lib-noir") ", "
+     (link-to "https://github.com/flatland/clojail" "clojail") ", and Chris Done's "
+     (link-to "https://github.com/chrisdone/jquery-console" "jquery-console") ". "
+     " The design is by " (link-to "http://apgwoz.com" "Andrew Gwozdziewycz") "."]))
 
-(defpartial home-html []
-  [:p.bottom
-   "Welcome to Try Clojure. See that little box up there? That's a Clojure repl. You can type "
-   "expressions and see their results right here in your browser. We also have a brief tutorial to "
-   "give you a taste of Clojure. Try it out by typing " [:code.expr "tutorial"] " in the console!"]
-  [:p.bottom
-   "Check out the site's source on "
-   (link-to "http://github.com/Raynes/tryclojure" "github")
-   "!"])
+(defn home-html []
+  (html
+    [:p.bottom
+      "Welcome to Clojure! "
+      "You can see a Clojure interpreter above - we call it a <em>REPL</em>."]
+    [:p.bottom "Type <code>next</code> in the REPL to begin." ]))
 
 (defn root-html []
   (html5
    [:head
-    (include-css "/resources/public/css/tryclojure.css")
+    [:meta {:name "viewport" :content "width=device-width, initial-scale=1"}]
+    (include-css "/css/tryclojure.css"
+                 "/css/gh-fork-ribbon.css")
     (include-js "http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"
-                "/resources/public/javascript/jquery-console/jquery.console.js"
-                "/resources/public/javascript/tryclojure.js")
+                "/javascript/jquery-console/jquery.console.js"
+                "/javascript/tryclojure.js")
     [:title "Try Clojure"]]
    [:body
     [:div#wrapper
+      [:div.github-fork-ribbon-wrapper.right
+       [:div.github-fork-ribbon
+         (link-to "https://github.com/Raynes/tryclojure" "Fork me on GitHub")]]
      [:div#content
       [:div#header
        [:h1
@@ -62,16 +59,11 @@
       [:div#container
        [:div#console.console]
        [:div#buttons
-        [:a#home.buttons "home"]
         [:a#links.buttons "links"]
         [:a#about.buttons.last "about"]]
        [:div#changer (home-html)]]
       [:div.footer
-       [:p.bottom "©2011 Anthony Grimes and numerous contributors"]
-       [:p.bottom
-        "Built with "
-        (link-to "http://webnoir.org" "Noir")
-        "."]]
+       [:p.bottom "©2011-2012 Anthony Grimes and numerous contributors."]]
       (javascript-tag
        "var _gaq = _gaq || [];
         _gaq.push(['_setAccount', 'UA-27340918-1']);
@@ -83,14 +75,3 @@
           var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
         })();")]]]))
 
-(defpage "/" []
-  (root-html))
-
-(defpage "/home" []
-  (home-html))
-
-(defpage "/about" []
-  (about-html))
-
-(defpage "/links" []
-  (links))
diff --git a/src/tryclojure/views/tutorial.clj b/src/tryclojure/views/tutorial.clj
index f7ee2b2..901fe52 100644
--- a/src/tryclojure/views/tutorial.clj
+++ b/src/tryclojure/views/tutorial.clj
@@ -1,5 +1,4 @@
-(ns tryclojure.views.tutorial
-  (:require [noir.core :refer [defpage]]))
+(ns tryclojure.views.tutorial)
 
-(defpage [:post "/tutorial"] {n :n}
-  (slurp (str "resources/public/tutorial/page" n ".html")))
\ No newline at end of file
+(defn tutorial-html [page] 
+  (slurp (str "resources/public/tutorial/" page ".html")))
\ No newline at end of file