diff --git a/lib/gollum/frontend/public/css/editor.css b/lib/gollum/frontend/public/css/editor.css
index 6d99045b..df072eef 100644
--- a/lib/gollum/frontend/public/css/editor.css
+++ b/lib/gollum/frontend/public/css/editor.css
@@ -22,6 +22,46 @@
   width: 100%;
 }
 
+/* @control title */
+#gollum-editor-title-field {
+  display: none;
+}
+
+#gollum-editor-title-field.active {
+  border-bottom: 1px solid #ddd;
+  display: block;
+  margin: 0 0 0.3em 0;
+  padding: 0 0 0.5em 0;
+}
+
+#gollum-editor-title-field label {
+  /* JAWS should see it, but you can't */
+  display: block;
+  height: 1px;
+  left: -5000px;
+  overflow: hidden;
+  position: absolute;
+  top: -5000px;
+  width: 1px;
+}
+
+#gollum-editor-title-field input {
+  background: #fff;
+  border: 1px solid #ddd;
+  color: #000;
+  font-size: 1.3em;
+  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font-weight: bold;
+  line-height: 1.8em;
+  margin: 0;
+  padding: 0.5em;
+  width: 40%;
+}
+
+#gollum-editor-title-field input.ph {
+  color: #999;
+}
+
 /* @control editor-view-tab */
 #gollum-editor #gollum-editor-type-switcher {
   display: none;
diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js b/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js
index 8cfbed60..7b0906db 100644
--- a/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js
+++ b/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js
@@ -11,6 +11,7 @@
   var DefaultOptions = {
     MarkupType: 'markdown',
     EditorMode: 'code',
+    NewFile: false,
     HasFunctionBar: true,
     Debug: true
   };
@@ -24,12 +25,21 @@
    */
   $.GollumEditor = function( IncomingOptions ) {
     
-    ActiveOptions = $.extend( DefaultOptions, IncomingOptions ); 
+    ActiveOptions = $.extend( DefaultOptions, IncomingOptions );
+    
     
     debug('GollumEditor loading');
     
-    if ( EditorHas.baseEditorMarkup() ) {    
-      // Initialise the function bar by loading proper definitions
+    if ( EditorHas.baseEditorMarkup() ) {
+      
+      if ( ActiveOptions.NewFile ) {
+        $('#gollum-editor-title-field').addClass('active');
+        $('#gollum-editor-title-field input').focus(function() {
+          $(this)[0].select();
+        });
+      }
+      
+      // Initialize the function bar by loading proper definitions
       if ( EditorHas.functionBar() ) {
         var htmlSetMarkupLang =
           $('#gollum-editor-body').attr('data-markup-lang');
@@ -226,6 +236,10 @@
     ff4Environment: function() {
       var ua = new RegExp(/Firefox\/4.0b/);
       return ( ua.test( navigator.userAgent ) );
+    },
+    
+    titleDisplayed: function() {
+      return ( ActiveOptions.NewFile );
     }
     
   };
@@ -597,7 +611,3 @@
    }
   
 // })(jQuery); 
-
-jQuery(document).ready(function() {
-  $.GollumEditor();
-});
\ No newline at end of file
diff --git a/lib/gollum/frontend/templates/create.mustache b/lib/gollum/frontend/templates/create.mustache
index 2f88edfa..4dc7457a 100644
--- a/lib/gollum/frontend/templates/create.mustache
+++ b/lib/gollum/frontend/templates/create.mustache
@@ -7,4 +7,9 @@
     {{>editor}}
   </div>
 </div>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+jQuery(document).ready(function() {
+  $.GollumEditor({ NewFile: true });
+});
+</script>
\ No newline at end of file
diff --git a/lib/gollum/frontend/templates/edit.mustache b/lib/gollum/frontend/templates/edit.mustache
index d447aeaf..b86a71cd 100644
--- a/lib/gollum/frontend/templates/edit.mustache
+++ b/lib/gollum/frontend/templates/edit.mustache
@@ -13,4 +13,9 @@
     {{>editor}}
   </div>
 </div>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+jQuery(document).ready(function() {
+  $.GollumEditor();
+});
+</script>
\ No newline at end of file
diff --git a/lib/gollum/frontend/templates/editor.mustache b/lib/gollum/frontend/templates/editor.mustache
index 8fb90183..d4fa5321 100644
--- a/lib/gollum/frontend/templates/editor.mustache
+++ b/lib/gollum/frontend/templates/editor.mustache
@@ -1,5 +1,9 @@
 <div id="gollum-editor">
-<form name="gollum-editor" action="#" method="post">
+<form name="gollum-editor" action="/create/{{escaped_name}}" method="post">
+  <div id="gollum-editor-title-field">
+    <label for="page">Page Title</label>
+    <input type="text" name="page" id="gollum-editor-page-title" value="{{page_name}}">
+  </div>
   <div id="gollum-editor-function-bar">
     <a href="#" id="function-bold" class="function-button">
       <span>Bold</span></a>
@@ -32,8 +36,8 @@
   </div>
   <fieldset id="gollum-editor-fields">
     <textarea id="gollum-editor-body"
-     data-markup-lang="markdown"></textarea>
-    <span class="aural"><br></span>
+     data-markup-lang="markdown" name="content">{{content}}</textarea>
+    <span class="br"><br></span>
     <input type="submit" id="gollum-editor-submit" value="Save" title="Save current changes">
   </fieldset>
 </form>
diff --git a/lib/gollum/frontend/templates/layout.mustache b/lib/gollum/frontend/templates/layout.mustache
index 94c78020..724cc036 100644
--- a/lib/gollum/frontend/templates/layout.mustache
+++ b/lib/gollum/frontend/templates/layout.mustache
@@ -5,19 +5,21 @@
   <link rel="stylesheet" type="text/css" href="/css/gollum.css" media="all">
   <link rel="stylesheet" type="text/css" href="/css/editor.css" media="all">
   <link rel="stylesheet" type="text/css" href="/css/template.css" media="all">
+  
+  <script type="text/javascript" src="/javascript/jquery.js"></script>
+  <script type="text/javascript" src="/javascript/gollum.js"></script>
+  <script type="text/javascript" src="/javascript/gollum.fx.js"></script>
+  <!-- TODO: only load this on the edit page -->
+  <script type="text/javascript" 
+    src="/javascript/gollum-editor/gollum.editor.js"></script>
+  <script type="text/javascript" 
+    src="/javascript/gollum-editor/langs/markdown.js"></script>
+    
   <title>{{title}}</title>
 </head>
 <body>
 
 {{{yield}}}
 
-<script type="text/javascript" src="/javascript/jquery.js"></script>
-<script type="text/javascript" src="/javascript/gollum.js"></script>
-<script type="text/javascript" src="/javascript/gollum.fx.js"></script>
-<!-- TODO: only load this on the edit page -->
-<script type="text/javascript" 
-  src="/javascript/gollum-editor/gollum.editor.js"></script>
-<script type="text/javascript" 
-  src="/javascript/gollum-editor/langs/markdown.js"></script>
 </body>
 </html>
diff --git a/scratch/TODO b/scratch/TODO
index 4c9a20ad..3ca791b6 100644
--- a/scratch/TODO
+++ b/scratch/TODO
@@ -1,9 +1,9 @@
-Gollum Editor
-  - Style / Generate dialogs
-  - Def: Org
-  - Def: Pod
-  - Def: RDoc
-  - Def: Restructured Text
-
-Make function bar button sprite
-Roll scratch/ design into Mustache
\ No newline at end of file
+* Editor
+  * Add sidebar field
+  * Add footer field
+  * Add edit summary field
+  * Create rest of markup lang definitions
+* Create Error Page
+* Create Compare Revisions Page
+* Create Search Results Page
+* Write Editor/Sidebar implementation notes for Rick
\ No newline at end of file