From 60d151497f9972b944bced880a2372b2d77187d5 Mon Sep 17 00:00:00 2001
From: Peter Fogg <pfogg@edx.org>
Date: Mon, 15 Jul 2013 09:21:25 -0400
Subject: [PATCH 01/22] Fix section release acceptance test failure.

---
 cms/static/js/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index f74a6cb5e4..b53d116808 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -734,7 +734,7 @@ function saveSetSectionScheduleDate(e) {
         var $thisSection = $('.courseware-section[data-id="' + id + '"]');
         var html = _.template(
             '<span class="published-status">' +
-                '<strong>' + gettext("Will Release:") + '</strong>' +
+                '<strong>' + gettext("Will Release: ") + '</strong>' +
                 gettext("<%= date %> at <%= time %> UTC") +
             '</span>' +
             '<a href="#" class="edit-button" data-date="<%= date %>" data-time="<%= time %>" data-id="<%= id %>">' +

From a2ac5c87db99d30ca197bbc1ddd084021cc7899f Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Fri, 12 Jul 2013 17:24:04 -0400
Subject: [PATCH 02/22] Studio: revises nav display issue by re-scoping poor
 Updates Sass rules

---
 .../client_templates/course_info_handouts.html    |  2 +-
 cms/static/sass/views/_updates.scss               | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/cms/static/client_templates/course_info_handouts.html b/cms/static/client_templates/course_info_handouts.html
index cf9fdb5c85..7fbbe9bc33 100644
--- a/cms/static/client_templates/course_info_handouts.html
+++ b/cms/static/client_templates/course_info_handouts.html
@@ -1,6 +1,6 @@
 <a href="#" class="edit-button"><span class="edit-icon"></span>Edit</a>
 
-<h2>Course Handouts</h2>
+<h2 class="title">Course Handouts</h2>
 <%if (model.get('data') != null) { %>
   <div class="handouts-content">
     <%= model.get('data') %>
diff --git a/cms/static/sass/views/_updates.scss b/cms/static/sass/views/_updates.scss
index 98adda2b5f..ba8b9bf6b0 100644
--- a/cms/static/sass/views/_updates.scss
+++ b/cms/static/sass/views/_updates.scss
@@ -2,12 +2,6 @@
 // ====================
 
 body.course.updates {
-	
-	h2 {
-		margin-bottom: 24px;
-		font-size: 22px;
-		font-weight: 300;
-	}
 
 	.course-info-wrapper {
 		display: table;
@@ -180,9 +174,10 @@ body.course.updates {
 	border-left: none;
 	background: $lightGrey;
 
-	h2 {
-		font-size: 18px;
-		font-weight: 700;
+	.title {
+		margin-bottom: 24px;
+		font-size: 22px;
+		font-weight: 300;
 	}
 
 	.edit-button {
@@ -220,4 +215,4 @@ body.course.updates {
 	textarea {
 		height: 300px;
 	}
-}
\ No newline at end of file
+}

From 88d06a16e507fb74a10babe8fd58c69fd7dc79e2 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 2 Jul 2013 01:28:27 -0400
Subject: [PATCH 03/22] Studio: renames and re-orgs app-wide Sass extends

---
 cms/static/sass/_mixins-inherited.scss |   1 -
 cms/static/sass/views/_textbooks.scss  |   6 +-
 common/static/sass/_mixins.scss        | 153 ++++++++++++++-----------
 3 files changed, 89 insertions(+), 71 deletions(-)
 delete mode 120000 cms/static/sass/_mixins-inherited.scss

diff --git a/cms/static/sass/_mixins-inherited.scss b/cms/static/sass/_mixins-inherited.scss
deleted file mode 120000
index f64a720561..0000000000
--- a/cms/static/sass/_mixins-inherited.scss
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/static/sass/_mixins-inherited.scss
\ No newline at end of file
diff --git a/cms/static/sass/views/_textbooks.scss b/cms/static/sass/views/_textbooks.scss
index ab2599581f..964615e16e 100644
--- a/cms/static/sass/views/_textbooks.scss
+++ b/cms/static/sass/views/_textbooks.scss
@@ -115,7 +115,7 @@ body.course.textbooks {
             }
 
             .delete {
-              @extend .btn-non;
+              @extend .ui-btn-non;
             }
           }
 
@@ -320,7 +320,7 @@ body.course.textbooks {
             }
 
             .action-upload {
-                @extend .btn-flat-outline;
+                @extend .ui-btn-flat-outline;
                 position: absolute;
                 top: 3px;
                 right: 0;
@@ -348,7 +348,7 @@ body.course.textbooks {
 
 
       .action-add-chapter {
-        @extend .btn-flat-outline;
+        @extend .ui-btn-flat-outline;
         @include font-size(16);
         display: block;
         width: 100%;
diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss
index 64248734c3..1fa270e68a 100644
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -26,7 +26,6 @@
   @include size($size);
 }
 
-
 // ====================
 
 // mixins - placeholder styling
@@ -44,78 +43,45 @@
 
 // ====================
 
-// extends - layout
-
-// used for page/view-level wrappers (for centering/grids)
-.wrapper {
+// extends - UI - used for page/view-level wrappers (for centering/grids)
+.ui-wrapper {
   @include clearfix();
   @include box-sizing(border-box);
   width: 100%;
 }
 
-// removes list styling/spacing when using uls, ols for navigation and less content-centric cases
-.no-list {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  text-indent: 0;
-
-  li {
-    margin: 0;
-    padding: 0;
-  }
+// extends - UI - window
+.ui-window {
+  @include clearfix();
+  @include border-radius(3px);
+  @include box-shadow(0 1px 1px $shadow-l1);
+  margin-bottom: $baseline;
+  border: 1px solid $gray-l2;
+  background: $white;
 }
 
-// extends - image-replacement hidden text
-.text-hide {
-  text-indent: 100%;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-// extends - hidden elems - screenreaders
-.text-sr {
-  border: 0;
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-}
-
-// extends - wrapping
-.text-wrap {
-  text-wrap: wrap;
-  white-space: pre-wrap;
-  white-space: -moz-pre-wrap;
-  word-wrap: break-word;
-}
-
-// extends - visual link
-.fake-link {
+// extends - UI - visual link
+.ui-fake-link {
   cursor: pointer;
 }
 
-// extends - functional disable
-.disabled {
+// extends - UI - functional disable
+.ui-disabled {
   pointer-events: none;
   outline: none;
 }
 
-// extends - depth levels
-.depth0 { z-index: 0; }
-.depth1 { z-index: 10; }
-.depth2 { z-index: 100; }
-.depth3 { z-index: 1000; }
-.depth4 { z-index: 10000; }
-.depth5 { z-index: 100000; }
+// extends - UI - depth levels
+.ui-depth0 { z-index: 0; }
+.ui-depth1 { z-index: 10; }
+.ui-depth2 { z-index: 100; }
+.ui-depth3 { z-index: 1000; }
+.ui-depth4 { z-index: 10000; }
+.ui-depth5 { z-index: 100000; }
 
-// ====================
 
-// extends - buttons
-.btn {
+// extends - UI - buttons
+.ui-btn {
   @include box-sizing(border-box);
   @include transition(color 0.25s ease-in-out 0s, border-color 0.25s ease-in-out 0s, background 0.25s ease-in-out 0s, box-shadow 0.25s ease-in-out 0s);
   display: inline-block;
@@ -139,18 +105,18 @@
 }
 
 // pill button
-.btn-pill {
+.ui-btn-pill {
   border-radius: ($baseline/5);
 }
 
-.btn-rounded {
+.ui-btn-rounded {
   border-radius: ($baseline/2);
 }
 
 // primary button
-.btn-primary {
-  @extend .btn;
-  @extend .btn-pill;
+.ui-btn-primary {
+  @extend .ui-btn;
+  @extend .ui-btn-pill;
   padding:($baseline/2) $baseline;
   border-width: 1px;
   border-style: solid;
@@ -172,8 +138,8 @@
 
 // secondary button
 .btn-secondary {
-  @extend .btn;
-  @extend .btn-pill;
+  @extend .ui-btn;
+  @extend .ui-btn-pill;
   border-width: 1px;
   border-style: solid;
   padding:($baseline/2) $baseline;
@@ -190,7 +156,7 @@
   }
 }
 
-.btn-flat-outline {
+.ui-btn-flat-outline {
   @extend .t-action4;
   @include transition(all .15s);
   font-weight: 600;
@@ -217,7 +183,7 @@
 }
 
 // button with no button shell until hover for understated actions
-.btn-non {
+.ui-btn-non {
   @include transition(all .15s);
   border: none;
   border-radius: ($baseline/4);
@@ -236,8 +202,61 @@
   }
 }
 
-// UI archetypes - well
+// extends - UI archetypes - well
 .ui-well {
   box-shadow: inset 0 1px 2px 1px $shadow;
   padding: ($baseline*0.75);
 }
+
+// ====================
+
+// extends - content - removes list styling/spacing when using uls, ols for navigation and less content-centric cases
+.cont-no-list {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  text-indent: 0;
+
+  li {
+    margin: 0;
+    padding: 0;
+  }
+}
+
+// extends - content - image-replacement hidden text
+.cont-text-hide {
+  text-indent: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+// extends - content - hidden elems - screenreaders
+.cont-text-sr {
+  border: 0;
+  clip: rect(0 0 0 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px;
+}
+
+// extends - content - wrapping
+.cont-text-wrap {
+  text-wrap: wrap;
+  white-space: pre-wrap;
+  white-space: -moz-pre-wrap;
+  word-wrap: break-word;
+}
+
+// content - text overflow by ellipsis
+.cont-overflow-elip {
+  @include box-sizing(border-box);
+  display: block;
+  width: auto;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+>>>>>>> Studio: renames and re-orgs app-wide Sass extends

From 7ea55757bf0eec72e6638649f0a51b3244b6e5d1 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 2 Jul 2013 01:28:56 -0400
Subject: [PATCH 04/22] Studio: references newly renamed app-wide Sass extends

---
 cms/static/sass/_base.scss                     |  4 ++--
 cms/static/sass/elements/_controls.scss        | 12 ++++++------
 cms/static/sass/elements/_header.scss          |  5 ++---
 cms/static/sass/elements/_modal.scss           |  6 +++---
 cms/static/sass/elements/_navigation.scss      |  2 +-
 cms/static/sass/elements/_sock.scss            |  8 ++++----
 cms/static/sass/elements/_system-feedback.scss | 14 +++++++-------
 cms/static/sass/views/_checklists.scss         |  6 +++---
 cms/static/sass/views/_export.scss             |  8 ++++----
 cms/static/sass/views/_import.scss             |  6 +++---
 cms/static/sass/views/_settings.scss           |  2 +-
 cms/static/sass/views/_static-pages.scss       |  2 +-
 12 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 4a20a98eb3..391896296d 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -576,7 +576,7 @@ p, ul, ol, dl {
 
 // misc
 hr.divide {
-  @extend .text-sr;
+  @extend .cont-text-sr;
 }
 
 .item-details {
@@ -824,7 +824,7 @@ hr.divide {
 
 // basic utility
 .sr {
-  @extend .text-sr;
+  @extend .cont-text-sr;
 }
 
 .fake-link {
diff --git a/cms/static/sass/elements/_controls.scss b/cms/static/sass/elements/_controls.scss
index 6859560361..1834bdf9ee 100644
--- a/cms/static/sass/elements/_controls.scss
+++ b/cms/static/sass/elements/_controls.scss
@@ -3,7 +3,7 @@
 
 // gray primary button
 .btn-primary-gray {
-  @extend .btn-primary;
+  @extend .ui-btn-primary;
   background: $gray-l1;
   border-color: $gray-l2;
   color: $white;
@@ -25,7 +25,7 @@
 
 // blue primary button
 .btn-primary-blue {
-  @extend .btn-primary;
+  @extend .ui-btn-primary;
   background: $blue;
   border-color: $blue-s1;
   color: $white;
@@ -48,7 +48,7 @@
 
 // green primary button
 .btn-primary-green {
-  @extend .btn-primary;
+  @extend .ui-btn-primary;
   background: $green;
   border-color: $green;
   color: $white;
@@ -71,7 +71,7 @@
 
 // gray secondary button
 .btn-secondary-gray {
-  @extend .btn-secondary;
+  @extend .ui-btn-secondary;
   border-color: $gray-l3;
   color: $gray-l1;
 
@@ -92,7 +92,7 @@
 
 // blue secondary button
 .btn-secondary-blue {
-  @extend .btn-secondary;
+  @extend .ui-btn-secondary;
   border-color: $blue-l3;
   color: $blue;
 
@@ -114,7 +114,7 @@
 
 // green secondary button
 .btn-secondary-green {
-  @extend .btn-secondary;
+  @extend .ui-btn-secondary;
   border-color: $green-l4;
   color: $green-l2;
 
diff --git a/cms/static/sass/elements/_header.scss b/cms/static/sass/elements/_header.scss
index fc430ed6a1..aa23d3fbba 100644
--- a/cms/static/sass/elements/_header.scss
+++ b/cms/static/sass/elements/_header.scss
@@ -2,10 +2,10 @@
 // ====================
 
 .wrapper-header {
-  @extend .depth3;
-  box-shadow: 0 1px 2px 0 $shadow-l1;
+  @extend .ui-depth3;
   position: relative;
   width: 100%;
+  box-shadow: 0 1px 2px 0 $shadow-l1;
   margin: 0;
   padding: 0 $baseline;
   background: $white;
@@ -22,7 +22,6 @@
   // ====================
 
   // basic layout
-
   .wrapper-l, .wrapper-r {
     background: $white;
   }
diff --git a/cms/static/sass/elements/_modal.scss b/cms/static/sass/elements/_modal.scss
index fd60e690e7..72c2d93734 100644
--- a/cms/static/sass/elements/_modal.scss
+++ b/cms/static/sass/elements/_modal.scss
@@ -2,7 +2,7 @@
 // ====================
 
 .modal-cover {
-	@extend .depth3;
+	@extend .ui-depth3;
 	display: none;
 	position: fixed;
 	top: 0;
@@ -13,7 +13,7 @@
 }
 
 .modal {
-	@extend .depth4;
+	@extend .ui-depth4;
 	display: none;
 	position: fixed;
 	top: 60px;
@@ -61,7 +61,7 @@
 
 // lean modal alternative
 #lean_overlay {
-	@extend .depth4;
+	@extend .ui-depth4;
 	position: fixed;
 	top: 0px;
 	left: 0px;
diff --git a/cms/static/sass/elements/_navigation.scss b/cms/static/sass/elements/_navigation.scss
index e118d231ef..d05965d83c 100644
--- a/cms/static/sass/elements/_navigation.scss
+++ b/cms/static/sass/elements/_navigation.scss
@@ -5,7 +5,7 @@
 nav {
 
   ol, ul {
-    @extend .no-list;
+    @extend .cont-no-list;
   }
 
   .nav-item {
diff --git a/cms/static/sass/elements/_sock.scss b/cms/static/sass/elements/_sock.scss
index 99829f7106..6b9b52860f 100644
--- a/cms/static/sass/elements/_sock.scss
+++ b/cms/static/sass/elements/_sock.scss
@@ -10,7 +10,7 @@
 
   .wrapper-inner {
     @include linear-gradient($gray-d3 0%, $gray-d3 98%, $black 100%);
-    @extend .depth0;
+    @extend .ui-depth0;
     display: none;
     width: 100% !important;
     border-bottom: 1px solid $white;
@@ -19,7 +19,7 @@
 
   // sock - actions
   .list-cta {
-    @extend .depth1;
+    @extend .ui-depth1;
     position: absolute;
     top: -($baseline*0.75);
     width: 100%;
@@ -27,7 +27,7 @@
     text-align: center;
 
     .cta-show-sock {
-      @extend .btn-pill;
+      @extend .ui-btn-pill;
       @extend .t-action4;
       background: $gray-l5;
       padding: ($baseline/2) $baseline;
@@ -113,7 +113,7 @@
         }
 
         .action-primary {
-          @extend .btn-primary-blue;
+          @extend .ui-btn-primary-blue;
           @extend .t-action3;
         }
       }
diff --git a/cms/static/sass/elements/_system-feedback.scss b/cms/static/sass/elements/_system-feedback.scss
index 5022a9f677..be1b41bf29 100644
--- a/cms/static/sass/elements/_system-feedback.scss
+++ b/cms/static/sass/elements/_system-feedback.scss
@@ -144,8 +144,8 @@
 
 // prompts
 .wrapper-prompt {
-  @extend .depth5;
-  @include transition(all $tmg-f3 ease-in-out 0s);
+  @extend .ui-depth5;
+  @include transition(all $tmg-f3 ease-in-out  0s);
   position: fixed;
   top: 0;
   background: $black-t0;
@@ -242,7 +242,7 @@
 
 // notifications
 .wrapper-notification {
-  @extend .depth5;
+  @extend .ui-depth5;
   @include clearfix();
   box-shadow: 0 -1px 3px $shadow, inset 0 3px 1px $blue;
   position: fixed;
@@ -444,7 +444,7 @@
     }
 
     .copy p {
-      @extend .text-sr;
+      @extend .cont-text-sr;
     }
   }
 }
@@ -453,7 +453,7 @@
 
 // alerts
 .wrapper-alert {
-  @extend .depth2;
+  @extend .ui-depth2;
   @include box-sizing(border-box);
   box-shadow: 0 1px 1px $white, inset 0 2px 2px $shadow-d1, inset 0 -4px 1px $blue;
   position: relative;
@@ -599,7 +599,7 @@
     text-align: center;
 
     .label {
-      @extend .text-sr;
+      @extend .cont-text-sr;
     }
 
     [class^="icon"] {
@@ -696,7 +696,7 @@ body.uxdesign.alerts {
   }
 
   .content-primary {
-    @extend .window;
+    @extend .ui-window;
     width: flex-grid(12, 12);
     margin-right: flex-gutter();
     padding: $baseline ($baseline*1.5);
diff --git a/cms/static/sass/views/_checklists.scss b/cms/static/sass/views/_checklists.scss
index 3f98765216..f2e134c32e 100644
--- a/cms/static/sass/views/_checklists.scss
+++ b/cms/static/sass/views/_checklists.scss
@@ -14,7 +14,7 @@ body.course.checklists {
 
   // checklists - general
   .course-checklist {
-    @extend .window;
+    @extend .ui-window;
     margin: 0 0 ($baseline*2) 0;
 
     &:last-child {
@@ -23,7 +23,7 @@ body.course.checklists {
 
     // visual status
     .viz-checklist-status {
-      @extend .text-hide;
+      @extend .cont-text-hide;
       @include size(100%,($baseline/4));
       position: relative;
       display: block;
@@ -40,7 +40,7 @@ body.course.checklists {
         background: $green;
 
         .int {
-          @extend .text-sr;
+          @extend .cont-text-sr;
         }
       }
     }
diff --git a/cms/static/sass/views/_export.scss b/cms/static/sass/views/_export.scss
index 933bb50252..954fe7fc81 100644
--- a/cms/static/sass/views/_export.scss
+++ b/cms/static/sass/views/_export.scss
@@ -2,9 +2,9 @@
 // ====================
 
 body.course.export {
-  
+
   .export-overview {
-    @extend .window;
+    @extend .ui-window;
     @include clearfix;
     padding: 30px 40px;
   }
@@ -40,7 +40,7 @@ body.course.export {
   }
 
   .export-form-wrapper {
-  
+
     .export-form {
       float: left;
       width: 35%;
@@ -122,4 +122,4 @@ body.course.export {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/cms/static/sass/views/_import.scss b/cms/static/sass/views/_import.scss
index e5fb955348..1f9c62d917 100644
--- a/cms/static/sass/views/_import.scss
+++ b/cms/static/sass/views/_import.scss
@@ -2,9 +2,9 @@
 // ====================
 
 body.course.import {
-  
+
   .import-overview {
-    @extend .window;
+    @extend .ui-window;
     @include clearfix;
     padding: 30px 40px;
   }
@@ -103,4 +103,4 @@ body.course.import {
     color: #fff;
     line-height: 48px;
   }
-}
\ No newline at end of file
+}
diff --git a/cms/static/sass/views/_settings.scss b/cms/static/sass/views/_settings.scss
index 2fc06f9df9..1430c41368 100644
--- a/cms/static/sass/views/_settings.scss
+++ b/cms/static/sass/views/_settings.scss
@@ -9,7 +9,7 @@ body.course.settings {
   }
 
   .content-primary {
-    @extend .window;
+    @extend .ui-window;
     width: flex-grid(9, 12);
     margin-right: flex-gutter();
     padding: $baseline ($baseline*1.5);
diff --git a/cms/static/sass/views/_static-pages.scss b/cms/static/sass/views/_static-pages.scss
index c62979ebc8..2bcf13441e 100644
--- a/cms/static/sass/views/_static-pages.scss
+++ b/cms/static/sass/views/_static-pages.scss
@@ -171,7 +171,7 @@ body.course.static-pages {
   }
 
   .static-page-details {
-    @extend .window;
+    @extend .ui-window;
     padding: 32px 40px;
 
     .row {

From 91a6e3476918825a806950ddd5773718b9b70a7f Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 2 Jul 2013 01:36:17 -0400
Subject: [PATCH 05/22] Studio: adds further comment/prefix revisions to Sass
 extends

---
 common/static/sass/_mixins.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss
index 1fa270e68a..21a8eb7196 100644
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -137,7 +137,7 @@
 }
 
 // secondary button
-.btn-secondary {
+.ui-btn-secondary {
   @extend .ui-btn;
   @extend .ui-btn-pill;
   border-width: 1px;
@@ -250,7 +250,7 @@
   word-wrap: break-word;
 }
 
-// content - text overflow by ellipsis
+// extends - content - text overflow by ellipsis
 .cont-overflow-elip {
   @include box-sizing(border-box);
   display: block;

From 34e9a21da8b241262ba6bee6fc89e604269ba654 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 2 Jul 2013 09:56:44 -0400
Subject: [PATCH 06/22] Studio: renames and simplifies .cont-trucated Sass
 extend

---
 common/static/sass/_mixins.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss
index 21a8eb7196..68a57e5077 100644
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -251,10 +251,8 @@
 }
 
 // extends - content - text overflow by ellipsis
-.cont-overflow-elip {
+.cont-truncated {
   @include box-sizing(border-box);
-  display: block;
-  width: auto;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;

From 19a7e63e40e873b2047f3370aa7c995c83db6102 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Mon, 8 Jul 2013 07:41:16 -0400
Subject: [PATCH 07/22] Studio: renames nav dropdown pattern and corrects
 references

---
 cms/static/sass/elements/_controls.scss | 12 ++++++------
 cms/static/sass/elements/_header.scss   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cms/static/sass/elements/_controls.scss b/cms/static/sass/elements/_controls.scss
index 1834bdf9ee..226603b81d 100644
--- a/cms/static/sass/elements/_controls.scss
+++ b/cms/static/sass/elements/_controls.scss
@@ -148,9 +148,9 @@
 // ====================
 
 // simple dropdown button styling - should we move this elsewhere?
-.btn-dd {
-  @extend .btn;
-  @extend .btn-pill;
+.ui-btn-dd {
+  @extend .ui-btn;
+  @extend .ui-btn-pill;
   padding:($baseline/4) ($baseline/2);
   border-width: 1px;
   border-style: solid;
@@ -158,7 +158,7 @@
   text-align: center;
 
   &:hover, &:active {
-    @extend .fake-link;
+    @extend .ui-fake-link;
     border-color: $gray-l3;
   }
 
@@ -169,8 +169,8 @@
 }
 
 // layout-based buttons - nav dd
-.btn-dd-nav-primary {
-  @extend .btn-dd;
+.ui-btn-dd-nav-primary {
+  @extend .ui-btn-dd;
   background: $white;
   border-color: $white;
   color: $gray-d1;
diff --git a/cms/static/sass/elements/_header.scss b/cms/static/sass/elements/_header.scss
index aa23d3fbba..56b2a0f061 100644
--- a/cms/static/sass/elements/_header.scss
+++ b/cms/static/sass/elements/_header.scss
@@ -75,7 +75,7 @@
 
     .title {
       @extend .t-action2;
-      @extend .btn-dd-nav-primary;
+      @extend .ui-btn-dd-nav-primary;
       @include transition(all $tmg-f2 ease-in-out 0s);
 
       .label, .icon-caret-down {

From 388724c485078aa535773fef94846275c18b66b7 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Fri, 12 Jul 2013 16:47:58 -0400
Subject: [PATCH 08/22] Studio: updates Sass mixins/extend references based on
 textbook/Sass cleanup

---
 cms/static/sass/_base.scss            | 2 +-
 cms/static/sass/elements/_sock.scss   | 2 +-
 cms/static/sass/views/_textbooks.scss | 4 ++--
 common/static/sass/_mixins.scss       | 7 +++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 391896296d..054a401e4b 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -877,7 +877,7 @@ body.js {
       text-align: center;
 
       .label {
-        @extend .text-sr;
+        @extend .cont-text-sr;
       }
 
       [class^="icon-"] {
diff --git a/cms/static/sass/elements/_sock.scss b/cms/static/sass/elements/_sock.scss
index 6b9b52860f..ff79cb10ef 100644
--- a/cms/static/sass/elements/_sock.scss
+++ b/cms/static/sass/elements/_sock.scss
@@ -113,7 +113,7 @@
         }
 
         .action-primary {
-          @extend .ui-btn-primary-blue;
+          @extend .btn-primary-blue;
           @extend .t-action3;
         }
       }
diff --git a/cms/static/sass/views/_textbooks.scss b/cms/static/sass/views/_textbooks.scss
index 964615e16e..8d2b2d9489 100644
--- a/cms/static/sass/views/_textbooks.scss
+++ b/cms/static/sass/views/_textbooks.scss
@@ -188,7 +188,7 @@ body.course.textbooks {
 
       .chapters-fields,
       .textbook-fields {
-        @extend .no-list;
+        @extend .cont-no-list;
 
         .field {
           margin: 0 0 ($baseline*0.75) 0;
@@ -365,7 +365,7 @@ body.course.textbooks {
 
  // dialog
 .wrapper-dialog {
-  @extend .depth5;
+  @extend .ui-depth5;
   @include transition(all 0.05s ease-in-out);
   position: fixed;
   top: 0;
diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss
index 68a57e5077..d3ead53b25 100644
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -53,8 +53,8 @@
 // extends - UI - window
 .ui-window {
   @include clearfix();
-  @include border-radius(3px);
-  @include box-shadow(0 1px 1px $shadow-l1);
+  border-radius: 3px;
+  box-shadow: 0 1px 1px $shadow-l1;
   margin-bottom: $baseline;
   border: 1px solid $gray-l2;
   background: $white;
@@ -198,7 +198,7 @@
   }
 
   span {
-    @extend .text-sr;
+    @extend .cont-text-sr;
   }
 }
 
@@ -257,4 +257,3 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
->>>>>>> Studio: renames and re-orgs app-wide Sass extends

From 7c5943a87c0a28aced02e3210b0078e5958c79c4 Mon Sep 17 00:00:00 2001
From: Greg Price <gprice@edx.org>
Date: Fri, 21 Jun 2013 13:05:48 -0400
Subject: [PATCH 09/22] Tweak behavior of submit buttons on register and login
 pages

The buttons are not re-enabled if the registration/login submission succeeds
(and, therefore, the user is about to be directed to another page). Also, any
error message that is present does not disappear immediately before the page
redirects.
---
 lms/templates/login.html    | 4 ++--
 lms/templates/register.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/templates/login.html b/lms/templates/login.html
index 671ce5a3e7..5ab63a86c2 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -38,13 +38,12 @@
         toggleSubmitButton(false);
       });
 
-      $('#login-form').on('ajax:complete', function() {
+      $('#login-form').on('ajax:error', function() {
         toggleSubmitButton(true);
       });
 
       $('#login-form').on('ajax:success', function(event, json, xhr) {
         if(json.success) {
-          $('.message.submission-error').removeClass('is-shown');
           var u=decodeURI(window.location.search);
           next=u.split("next=")[1];
           if (next) {
@@ -53,6 +52,7 @@
             location.href="${reverse('dashboard')}";
           }
         } else {
+          toggleSubmitButton(true);
           $('.message.submission-error').addClass('is-shown').focus();
           $('.message.submission-error .message-copy').html(json.value);
         }
diff --git a/lms/templates/register.html b/lms/templates/register.html
index 1c2490c0a0..57a9ffa843 100644
--- a/lms/templates/register.html
+++ b/lms/templates/register.html
@@ -45,15 +45,15 @@
         toggleSubmitButton(false);
       });
 
-      $('#register-form').on('ajax:complete', function() {
+      $('#register-form').on('ajax:error', function() {
         toggleSubmitButton(true);
       });
 
       $('#register-form').on('ajax:success', function(event, json, xhr) {
         if(json.success) {
-          $('.message.submission-error').removeClass('is-shown');
           location.href="${reverse('dashboard')}";
        } else {
+         toggleSubmitButton(true);
          $('.status.message.submission-error').addClass('is-shown').focus();
          $('.status.message.submission-error .message-copy').html(json.value).stop().css("display", "block");
          $(".field-error").removeClass('field-error');

From c770458e6a7171e265d05f617c3abceeedc8c518 Mon Sep 17 00:00:00 2001
From: Renzo Lucioni <renzolucioni@gmail.com>
Date: Mon, 15 Jul 2013 13:31:56 -0400
Subject: [PATCH 10/22] Reinstate problem_check event as Problem Checked event

---
 common/lib/xmodule/xmodule/js/src/capa/display.coffee | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
index e29276936b..fbbba36134 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
@@ -162,8 +162,9 @@ class @Problem
   #       maybe preferable to consolidate all dispatches to use FormData
   ###
   check_fd: =>
-    # Calling check from check_fd will result in firing the 'problem_check' event twice, since it is also called in the check function.
-    #Logger.log 'problem_check', @answers
+    # Calling check from check_fd will result in firing the 'problem_check' event twice, 
+    # since it is also called in the check function.
+    # Logger.log 'problem_check', @answers
 
     # If there are no file inputs in the problem, we can fall back on @check
     if $('input:file').length == 0
@@ -239,6 +240,11 @@ class @Problem
   check: =>
     @check_waitfor()
     Logger.log 'problem_check', @answers
+
+    # Segment.io
+    analytics.track "Problem Checked",
+      answers: @answers
+
     $.postWithPrefix "#{@url}/problem_check", @answers, (response) =>
       switch response.success
         when 'incorrect', 'correct'

From 92ae50d415ad19c6742d1797c64dc7618a53b5fd Mon Sep 17 00:00:00 2001
From: Renzo Lucioni <renzolucioni@gmail.com>
Date: Mon, 15 Jul 2013 15:18:01 -0400
Subject: [PATCH 11/22] Remove unused code and include problem ID of data we
 send

---
 common/lib/xmodule/xmodule/js/src/capa/display.coffee | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
index fbbba36134..b7dbf6864d 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
@@ -22,7 +22,6 @@ class @Problem
 
     @$('section.action input:button').click @refreshAnswers
     @$('section.action input.check').click @check_fd
-    #@$('section.action input.check').click @check
     @$('section.action input.reset').click @reset
     @$('section.action button.show').click @show
     @$('section.action input.save').click @save
@@ -162,10 +161,6 @@ class @Problem
   #       maybe preferable to consolidate all dispatches to use FormData
   ###
   check_fd: =>
-    # Calling check from check_fd will result in firing the 'problem_check' event twice, 
-    # since it is also called in the check function.
-    # Logger.log 'problem_check', @answers
-
     # If there are no file inputs in the problem, we can fall back on @check
     if $('input:file').length == 0
       @check()
@@ -243,6 +238,7 @@ class @Problem
 
     # Segment.io
     analytics.track "Problem Checked",
+      problem_id: @id
       answers: @answers
 
     $.postWithPrefix "#{@url}/problem_check", @answers, (response) =>

From ef8618f7adb0f8e8764703d3b3b4fda799f93af3 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 24 Jun 2013 12:52:50 -0400
Subject: [PATCH 12/22] Make DraftModuleStore mongo only

DraftModuleStore was originally designed as a mixin, but never used that
way, and with the upcoming changes to use the versioned module store,
never will be. This changes removes a circular dependency between
mongo.py and draft.py.
---
 common/lib/xmodule/xmodule/modulestore/tests/django_utils.py | 2 +-
 lms/djangoapps/courseware/tests/tests.py                     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py b/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
index 6c5c1f66ca..c32d0bca4c 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
@@ -48,7 +48,7 @@ def draft_mongo_store_config(data_dir):
 
     return {
         'default': {
-            'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore',
+            'ENGINE': 'xmodule.modulestore.mongo.draft.DraftModuleStore',
             'OPTIONS': modulestore_options
         },
         'direct': {
diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index 17cc848ad3..bbdf97ca9b 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -8,7 +8,6 @@ from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
 
 import xmodule.modulestore.django
-
 from xmodule.error_module import ErrorDescriptor
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore import Location
@@ -134,7 +133,7 @@ class TestCoursesLoadTestCase_XmlModulestore(PageLoaderTestCase):
     def setUp(self):
         super(TestCoursesLoadTestCase_XmlModulestore, self).setUp()
         self.setup_user()
-        xmodule.modulestore.django._MODULESTORES = {}
+        xmodule.modulestore.django._MODULESTORES.clear()
 
     def test_toy_course_loads(self):
         module_class = 'xmodule.hidden_module.HiddenDescriptor'
@@ -155,7 +154,7 @@ class TestCoursesLoadTestCase_MongoModulestore(PageLoaderTestCase):
     def setUp(self):
         super(TestCoursesLoadTestCase_MongoModulestore, self).setUp()
         self.setup_user()
-        xmodule.modulestore.django._MODULESTORES = {}
+        xmodule.modulestore.django._MODULESTORES.clear()
         modulestore().collection.drop()
 
     def test_toy_course_loads(self):

From 35f66f84695baa88e7acd26c359523ecd278e608 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@edx.org>
Date: Tue, 16 Jul 2013 09:20:35 -0400
Subject: [PATCH 13/22] Update MathJax to the latest stable version (2.2), to
 fix IE10 bug LMS-194

---
 common/templates/mathjax_include.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/templates/mathjax_include.html b/common/templates/mathjax_include.html
index 803f2145a4..0ddbd68eee 100644
--- a/common/templates/mathjax_include.html
+++ b/common/templates/mathjax_include.html
@@ -33,4 +33,4 @@
 <!-- This must appear after all mathjax-config blocks, so it is after the imports from the other templates.
      It can't be run through static.url because MathJax uses crazy url introspection to do lazy loading of
      MathJax extension libraries -->
-<script type="text/javascript" src="https://edx-static.s3.amazonaws.com/mathjax-MathJax-07669ac/MathJax.js?config=TeX-MML-AM_HTMLorMML-full"></script>
+<script type="text/javascript" src="https://edx-static.s3.amazonaws.com/mathjax-MathJax-727332c/MathJax.js?config=TeX-MML-AM_HTMLorMML-full"></script>

From 3a095acced7fcc5d040681d4fbd923c9d25ec52c Mon Sep 17 00:00:00 2001
From: James Tauber <jtauber@jtauber.com>
Date: Tue, 16 Jul 2013 13:38:34 -0400
Subject: [PATCH 14/22] changed transifex project to edx-platform

---
 .tx/config | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.tx/config b/.tx/config
index 540c4732af..9288418924 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,25 +1,25 @@
 [main]
 host = https://www.transifex.com
 
-[edx-studio.django-partial]
+[edx-platform.django-partial]
 file_filter = conf/locale/<lang>/LC_MESSAGES/django-partial.po
 source_file = conf/locale/en/LC_MESSAGES/django-partial.po
 source_lang = en
 type = PO
 
-[edx-studio.djangojs]
+[edx-platform.djangojs]
 file_filter = conf/locale/<lang>/LC_MESSAGES/djangojs.po
 source_file = conf/locale/en/LC_MESSAGES/djangojs.po
 source_lang = en
 type = PO
 
-[edx-studio.mako]
+[edx-platform.mako]
 file_filter = conf/locale/<lang>/LC_MESSAGES/mako.po
 source_file = conf/locale/en/LC_MESSAGES/mako.po
 source_lang = en
 type = PO
 
-[edx-studio.messages]
+[edx-platform.messages]
 file_filter = conf/locale/<lang>/LC_MESSAGES/messages.po
 source_file = conf/locale/en/LC_MESSAGES/messages.po
 source_lang = en

From 8c904f31a90af89dea026489d8e316e93cb85c20 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Tue, 16 Jul 2013 14:22:42 -0400
Subject: [PATCH 15/22] Move defaults from yaml templates to field definitions.

This standardizes the XModule field default values to be the same as the
values that are presented by studio when a component is added to a
course.
---
 .../features/discussion-editor.py             |   6 +-
 .../contentstore/features/html-editor.py      |   2 +-
 .../contentstore/features/problem-editor.py   |  14 +-
 .../contentstore/features/video-editor.py     |   2 +-
 .../contentstore/tests/test_contentstore.py   |  24 +-
 .../tests/test_course_settings.py             |   2 -
 common/djangoapps/xmodule_modifiers.py        |   2 +-
 .../lib/xmodule/xmodule/annotatable_module.py |  27 +-
 common/lib/xmodule/xmodule/capa_module.py     |  27 +-
 .../xmodule/combined_open_ended_module.py     |  54 +++-
 common/lib/xmodule/xmodule/course_module.py   | 254 ++++++++++++++----
 .../lib/xmodule/xmodule/discussion_module.py  |  22 +-
 common/lib/xmodule/xmodule/html_module.py     |  81 +++++-
 .../xmodule/xmodule/peer_grading_module.py    |   9 +
 common/lib/xmodule/xmodule/raw_module.py      |   2 +-
 .../xmodule/templates/about/empty.yaml        |   6 +-
 .../xmodule/templates/about/overview.yaml     |  79 +++---
 .../templates/annotatable/default.yaml        |  21 +-
 .../templates/combinedopenended/default.yaml  |  38 +--
 .../xmodule/templates/course/empty.yaml       | 125 +--------
 .../xmodule/templates/courseinfo/empty.yaml   |   6 +-
 .../xmodule/templates/default/empty.yaml      |   6 +-
 .../xmodule/templates/discussion/default.yaml |  10 +-
 .../xmodule/templates/html/announcement.yaml  |   3 +-
 .../xmodule/xmodule/templates/html/empty.yaml |   8 +-
 .../xmodule/templates/html/latex_html.yaml    |  14 +-
 .../templates/peer_grading/default.yaml       |  10 +-
 .../templates/problem/blank_common.yaml       |   5 +
 .../templates/problem/circuitschematic.yaml   | 111 ++++----
 .../xmodule/templates/problem/empty.yaml      |  12 +-
 .../xmodule/templates/statictab/empty.yaml    |   6 +-
 .../xmodule/templates/video/default.yaml      |   6 +-
 .../xmodule/templates/videoalpha/default.yaml |  12 +-
 .../xmodule/templates/word_cloud/default.yaml |   6 +-
 common/lib/xmodule/xmodule/video_module.py    |  15 ++
 .../lib/xmodule/xmodule/videoalpha_module.py  |  16 +-
 .../lib/xmodule/xmodule/word_cloud_module.py  |  10 +-
 common/lib/xmodule/xmodule/x_module.py        | 126 ++++++---
 lms/xmodule_namespace.py                      |   8 +-
 39 files changed, 699 insertions(+), 488 deletions(-)
 create mode 100644 common/lib/xmodule/xmodule/templates/problem/blank_common.yaml

diff --git a/cms/djangoapps/contentstore/features/discussion-editor.py b/cms/djangoapps/contentstore/features/discussion-editor.py
index ae3da3c458..a4a4b71668 100644
--- a/cms/djangoapps/contentstore/features/discussion-editor.py
+++ b/cms/djangoapps/contentstore/features/discussion-editor.py
@@ -17,9 +17,9 @@ def i_created_discussion_tag(step):
 def i_see_only_the_settings_and_values(step):
     world.verify_all_setting_entries(
         [
-            ['Category', "Week 1", True],
-            ['Display Name', "Discussion Tag", True],
-            ['Subcategory', "Topic-Level Student-Visible Label", True]
+            ['Category', "Week 1", False],
+            ['Display Name', "Discussion Tag", False],
+            ['Subcategory', "Topic-Level Student-Visible Label", False]
         ])
 
 
diff --git a/cms/djangoapps/contentstore/features/html-editor.py b/cms/djangoapps/contentstore/features/html-editor.py
index 054c0ea642..53462ba094 100644
--- a/cms/djangoapps/contentstore/features/html-editor.py
+++ b/cms/djangoapps/contentstore/features/html-editor.py
@@ -14,4 +14,4 @@ def i_created_blank_html_page(step):
 
 @step('I see only the HTML display name setting$')
 def i_see_only_the_html_display_name(step):
-    world.verify_all_setting_entries([['Display Name', "Blank HTML Page", True]])
+    world.verify_all_setting_entries([['Display Name', "Blank HTML Page", False]])
diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py
index 5d12b23d90..15f5da95e9 100644
--- a/cms/djangoapps/contentstore/features/problem-editor.py
+++ b/cms/djangoapps/contentstore/features/problem-editor.py
@@ -18,8 +18,9 @@ def i_created_blank_common_problem(step):
     world.create_component_instance(
         step,
         '.large-problem-icon',
-        'i4x://edx/templates/problem/Blank_Common_Problem',
-        '.xmodule_CapaModule'
+        'problem',
+        '.xmodule_CapaModule',
+        'blank_common.yaml'
     )
 
 
@@ -32,11 +33,12 @@ def i_edit_and_select_settings(step):
 def i_see_five_settings_with_values(step):
     world.verify_all_setting_entries(
         [
-            [DISPLAY_NAME, "Blank Common Problem", True],
+            [DISPLAY_NAME, "New problem", True],
             [MAXIMUM_ATTEMPTS, "", False],
             [PROBLEM_WEIGHT, "", False],
-            [RANDOMIZATION, "Never", True],
-            [SHOW_ANSWER, "Finished", True]
+            # Not sure why these are True other than via inspection
+            [RANDOMIZATION, "Always", True],
+            [SHOW_ANSWER, "Closed", True]
         ])
 
 
@@ -203,7 +205,7 @@ def verify_modified_display_name_with_special_chars():
 
 
 def verify_unset_display_name():
-    world.verify_setting_entry(world.get_setting_entry(DISPLAY_NAME), DISPLAY_NAME, '', False)
+    world.verify_setting_entry(world.get_setting_entry(DISPLAY_NAME), DISPLAY_NAME, 'Blank Advanced Problem', False)
 
 
 def set_weight(weight):
diff --git a/cms/djangoapps/contentstore/features/video-editor.py b/cms/djangoapps/contentstore/features/video-editor.py
index a6865fdd6d..e0f76b30ad 100644
--- a/cms/djangoapps/contentstore/features/video-editor.py
+++ b/cms/djangoapps/contentstore/features/video-editor.py
@@ -7,7 +7,7 @@ from lettuce import world, step
 @step('I see the correct settings and default values$')
 def i_see_the_correct_settings_and_values(step):
     world.verify_all_setting_entries([['Default Speed', 'OEoXaMPEzfM', False],
-                                      ['Display Name', 'default', True],
+                                      ['Display Name', 'Video Title', False],
                                       ['Download Track', '', False],
                                       ['Download Video', '', False],
                                       ['Show Captions', 'True', False],
diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index be122fa1a4..6099b60eb1 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -135,7 +135,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         self.check_components_on_page(ADVANCED_COMPONENT_TYPES, ['Video Alpha',
                                                                  'Word cloud',
                                                                  'Annotation',
-                                                                 'Open Ended Response',
+                                                                 'Open Ended Grading',
                                                                  'Peer Grading Interface'])
 
     def test_advanced_components_require_two_clicks(self):
@@ -1271,6 +1271,28 @@ class ContentStoreTest(ModuleStoreTestCase):
 
         self.assertEqual(timedelta(1), new_module.lms.graceperiod)
 
+    def test_default_metadata_inheritance(self):
+        course = CourseFactory.create()
+        vertical = ItemFactory.create(parent_location=course.location)
+        course.children.append(vertical)
+        # in memory
+        self.assertIsNotNone(course.start)
+        self.assertEqual(course.start, vertical.lms.start)
+        self.assertEqual(course.textbooks, [])
+        self.assertIn('GRADER', course.grading_policy)
+        self.assertIn('GRADE_CUTOFFS', course.grading_policy)
+        self.assertGreaterEqual(len(course.checklists), 4)
+
+        # by fetching
+        module_store = modulestore('direct')
+        fetched_course = module_store.get_item(course.location)
+        fetched_item = module_store.get_item(vertical.location)
+        self.assertIsNotNone(fetched_course.start)
+        self.assertEqual(course.start, fetched_course.start)
+        self.assertEqual(fetched_course.start, fetched_item.lms.start)
+        self.assertEqual(course.textbooks, fetched_course.textbooks)
+        # is this test too strict? i.e., it requires the dicts to be ==
+        self.assertEqual(course.checklists, fetched_course.checklists)
 
 class TemplateTestCase(ModuleStoreTestCase):
 
diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py
index 21d7d69d41..6c23e68240 100644
--- a/cms/djangoapps/contentstore/tests/test_course_settings.py
+++ b/cms/djangoapps/contentstore/tests/test_course_settings.py
@@ -36,7 +36,6 @@ class CourseDetailsTestCase(CourseTestCase):
         self.assertIsNone(details.enrollment_start, "enrollment_start date somehow initialized " + str(details.enrollment_start))
         self.assertIsNone(details.enrollment_end, "enrollment_end date somehow initialized " + str(details.enrollment_end))
         self.assertIsNone(details.syllabus, "syllabus somehow initialized" + str(details.syllabus))
-        self.assertEqual(details.overview, "", "overview somehow initialized" + details.overview)
         self.assertIsNone(details.intro_video, "intro_video somehow initialized" + str(details.intro_video))
         self.assertIsNone(details.effort, "effort somehow initialized" + str(details.effort))
 
@@ -49,7 +48,6 @@ class CourseDetailsTestCase(CourseTestCase):
         self.assertIsNone(jsondetails['enrollment_start'], "enrollment_start date somehow initialized ")
         self.assertIsNone(jsondetails['enrollment_end'], "enrollment_end date somehow initialized ")
         self.assertIsNone(jsondetails['syllabus'], "syllabus somehow initialized")
-        self.assertEqual(jsondetails['overview'], "", "overview somehow initialized")
         self.assertIsNone(jsondetails['intro_video'], "intro_video somehow initialized")
         self.assertIsNone(jsondetails['effort'], "effort somehow initialized")
 
diff --git a/common/djangoapps/xmodule_modifiers.py b/common/djangoapps/xmodule_modifiers.py
index 7a74e75591..3914892bbf 100644
--- a/common/djangoapps/xmodule_modifiers.py
+++ b/common/djangoapps/xmodule_modifiers.py
@@ -120,7 +120,7 @@ def add_histogram(get_html, module, user):
                 # doesn't like symlinks)
                 filepath = filename
             data_dir = osfs.root_path.rsplit('/')[-1]
-            giturl = getattr(module.lms, 'giturl', '') or 'https://github.com/MITx'
+            giturl = module.lms.giturl or 'https://github.com/MITx'
             edit_link = "%s/%s/tree/master/%s" % (giturl, data_dir, filepath)
         else:
             edit_link = False
diff --git a/common/lib/xmodule/xmodule/annotatable_module.py b/common/lib/xmodule/xmodule/annotatable_module.py
index e8674360c3..8b1bbc71d3 100644
--- a/common/lib/xmodule/xmodule/annotatable_module.py
+++ b/common/lib/xmodule/xmodule/annotatable_module.py
@@ -6,12 +6,37 @@ from pkg_resources import resource_string
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
 from xblock.core import Scope, String
+import textwrap
 
 log = logging.getLogger(__name__)
 
 
 class AnnotatableFields(object):
-    data = String(help="XML data for the annotation", scope=Scope.content)
+    data = String(help="XML data for the annotation", scope=Scope.content,
+        default=textwrap.dedent(
+        """\
+        <annotatable>
+            <instructions>
+                <p>Enter your (optional) instructions for the exercise in HTML format.</p>
+                <p>Annotations are specified by an <code>&lt;annotation&gt;</code> tag which may may have the following attributes:</p>
+                <ul class="instructions-template">
+                    <li><code>title</code> (optional). Title of the annotation. Defaults to <i>Commentary</i> if omitted.</li>
+                    <li><code>body</code> (<b>required</b>). Text of the annotation.</li>
+                    <li><code>problem</code> (optional). Numeric index of the problem associated with this annotation. This is a zero-based index, so the first problem on the page would have <code>problem="0"</code>.</li>
+                    <li><code>highlight</code> (optional). Possible values: yellow, red, orange, green, blue, or purple. Defaults to yellow if this attribute is omitted.</li>
+                </ul>
+            </instructions>
+            <p>Add your HTML with annotation spans here.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. <annotation title="My title" body="My comment" highlight="yellow" problem="0">Ut sodales laoreet est, egestas gravida felis egestas nec.</annotation> Aenean at volutpat erat. Cras commodo viverra nibh in aliquam.</p>
+            <p>Nulla facilisi. <annotation body="Basic annotation example." problem="1">Pellentesque id vestibulum libero.</annotation> Suspendisse potenti. Morbi scelerisque nisi vitae felis dictum mattis. Nam sit amet magna elit. Nullam volutpat cursus est, sit amet sagittis odio vulputate et. Curabitur euismod, orci in vulputate imperdiet, augue lorem tempor purus, id aliquet augue turpis a est. Aenean a sagittis libero. Praesent fringilla pretium magna, non condimentum risus elementum nec. Pellentesque faucibus elementum pharetra. Pellentesque vitae metus eros.</p>
+        </annotatable>
+        """))
+    display_name = String(
+        display_name="Display Name",
+        help="Display name for this module",
+        scope=Scope.settings,
+        default='Annotation',
+    )
 
 
 class AnnotatableModule(AnnotatableFields, XModule):
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index eeb8f19439..752f0d3362 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -77,6 +77,14 @@ class CapaFields(object):
     """
     Define the possible fields for a Capa problem
     """
+    display_name = String(
+        display_name="Display Name",
+        help="This name appears in the horizontal navigation at the top of the page.",
+        scope=Scope.settings,
+        # it'd be nice to have a useful default but it screws up other things; so,
+        # use display_name_with_default for those
+        default="Blank Advanced Problem"
+    )
     attempts = Integer(help="Number of attempts taken by the student on this problem",
                        default=0, scope=Scope.user_state)
     max_attempts = Integer(
@@ -94,7 +102,8 @@ class CapaFields(object):
         display_name="Show Answer",
         help=("Defines when to show the answer to the problem. "
               "A default value can be set in Advanced Settings."),
-        scope=Scope.settings, default="closed",
+        scope=Scope.settings,
+        default="closed",
         values=[
             {"display_name": "Always", "value": "always"},
             {"display_name": "Answered", "value": "answered"},
@@ -106,21 +115,24 @@ class CapaFields(object):
     )
     force_save_button = Boolean(
         help="Whether to force the save button to appear on the page",
-        scope=Scope.settings, default=False
+        scope=Scope.settings,
+        default=False
     )
     rerandomize = Randomization(
         display_name="Randomization",
         help="Defines how often inputs are randomized when a student loads the problem. "
-        "This setting only applies to problems that can have randomly generated numeric values. "
-        "A default value can be set in Advanced Settings.",
-        default="always", scope=Scope.settings, values=[
+             "This setting only applies to problems that can have randomly generated numeric values. "
+             "A default value can be set in Advanced Settings.",
+        default="always",
+        scope=Scope.settings,
+        values=[
             {"display_name": "Always", "value": "always"},
             {"display_name": "On Reset", "value": "onreset"},
             {"display_name": "Never", "value": "never"},
             {"display_name": "Per Student", "value": "per_student"}
         ]
     )
-    data = String(help="XML data for the problem", scope=Scope.content)
+    data = String(help="XML data for the problem", scope=Scope.content, default="<problem></problem>")
     correct_map = Dict(help="Dictionary with the correctness of current student answers",
                        scope=Scope.user_state, default={})
     input_state = Dict(help="Dictionary for maintaining the state of inputtypes", scope=Scope.user_state)
@@ -134,13 +146,12 @@ class CapaFields(object):
         values={"min": 0, "step": .1},
         scope=Scope.settings
     )
-    markdown = String(help="Markdown source of this module", scope=Scope.settings)
+    markdown = String(help="Markdown source of this module", default="", scope=Scope.settings)
     source_code = String(
         help="Source code for LaTeX and Word problems. This feature is not well-supported.",
         scope=Scope.settings
     )
 
-
 class CapaModule(CapaFields, XModule):
     """
     An XModule implementing LonCapa format problems, implemented by way of
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 52d98f032e..13f00bb77e 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -9,6 +9,7 @@ from xblock.core import Integer, Scope, String, List, Float, Boolean
 from xmodule.open_ended_grading_classes.combined_open_ended_modulev1 import CombinedOpenEndedV1Module, CombinedOpenEndedV1Descriptor
 from collections import namedtuple
 from .fields import Date
+import textwrap
 
 log = logging.getLogger("mitx.courseware")
 
@@ -27,6 +28,38 @@ VERSION_TUPLES = {
 }
 
 DEFAULT_VERSION = 1
+DEFAULT_DATA = textwrap.dedent("""\
+    <combinedopenended>
+        <rubric>
+            <rubric>
+                <category>
+                  <description>Category 1</description>
+                  <option>
+                      The response does not incorporate what is needed for a one response.
+                  </option>
+                  <option>
+                      The response is correct for category 1.
+                  </option>
+                </category>
+            </rubric>
+        </rubric>
+        <prompt>
+            <p>Why is the sky blue?</p>
+        </prompt>
+        <task>
+            <selfassessment/>
+        </task>
+        <task>
+            <openended min_score_to_attempt="1" max_score_to_attempt="2">
+                    <openendedparam>
+                        <initial_display>Enter essay here.</initial_display>
+                        <answer_display>This is the answer.</answer_display>
+                        <grader_payload>{"grader_settings" : "peer_grading.conf", "problem_id" : "700x/Demo"}</grader_payload>
+                    </openendedparam>
+            </openended>
+        </task>
+    </combinedopenended>
+""")
 
 
 class VersionInteger(Integer):
@@ -85,13 +118,30 @@ class CombinedOpenEndedFields(object):
         scope=Scope.settings
     )
     version = VersionInteger(help="Current version number", default=DEFAULT_VERSION, scope=Scope.settings)
-    data = String(help="XML data for the problem", scope=Scope.content)
+    data = String(help="XML data for the problem", scope=Scope.content,
+        default=DEFAULT_DATA)
     weight = Float(
         display_name="Problem Weight",
         help="Defines the number of points each problem is worth. If the value is not set, each problem is worth one point.",
         scope=Scope.settings, values={"min" : 0 , "step": ".1"}
     )
-    markdown = String(help="Markdown source of this module", scope=Scope.settings)
+    markdown = String(
+        help="Markdown source of this module",
+        default=textwrap.dedent("""\
+            [rubric]
+            + Category 1
+            - The response does not incorporate what is needed for a one response.
+            - The response is correct for category 1.
+            [rubric]
+            [prompt]
+            <p>Why is the sky blue?</p>
+            [prompt]
+            [tasks]
+            (Self), ({1-2}AI)
+            [tasks]
+        """),
+        scope=Scope.settings
+    )
 
 
 class CombinedOpenEndedModule(CombinedOpenEndedFields, XModule):
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index d75033c8a0..ceadee1c15 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -145,16 +145,56 @@ class TextbookList(List):
 
 
 class CourseFields(object):
-    textbooks = TextbookList(help="List of pairs of (title, url) for textbooks used in this course", scope=Scope.content)
+    textbooks = TextbookList(help="List of pairs of (title, url) for textbooks used in this course",
+        default=[], scope=Scope.content)
     wiki_slug = String(help="Slug that points to the wiki for this course", scope=Scope.content)
     enrollment_start = Date(help="Date that enrollment for this class is opened", scope=Scope.settings)
     enrollment_end = Date(help="Date that enrollment for this class is closed", scope=Scope.settings)
-    start = Date(help="Start time when this module is visible", scope=Scope.settings)
+    start = Date(help="Start time when this module is visible",
+        # using now(UTC()) resulted in fractional seconds which screwed up comparisons and anyway w/b the
+        # time of first invocation of this stmt on the server
+        default=datetime.fromtimestamp(0, UTC()),
+        scope=Scope.settings)
     end = Date(help="Date that this class ends", scope=Scope.settings)
     advertised_start = String(help="Date that this course is advertised to start", scope=Scope.settings)
-    grading_policy = Dict(help="Grading policy definition for this class", scope=Scope.content)
+    grading_policy = Dict(help="Grading policy definition for this class",
+        default={"GRADER": [
+                {
+                    "type": "Homework",
+                    "min_count": 12,
+                    "drop_count": 2,
+                    "short_label": "HW",
+                    "weight": 0.15
+                },
+                {
+                    "type": "Lab",
+                    "min_count": 12,
+                    "drop_count": 2,
+                    "weight": 0.15
+                },
+                {
+                    "type": "Midterm Exam",
+                    "short_label": "Midterm",
+                    "min_count": 1,
+                    "drop_count": 0,
+                    "weight": 0.3
+                },
+                {
+                    "type": "Final Exam",
+                    "short_label": "Final",
+                    "min_count": 1,
+                    "drop_count": 0,
+                    "weight": 0.4
+                }
+            ],
+            "GRADE_CUTOFFS": {
+                "Pass": 0.5
+            }},
+            scope=Scope.content)
     show_calculator = Boolean(help="Whether to show the calculator in this course", default=False, scope=Scope.settings)
-    display_name = String(help="Display name for this module", scope=Scope.settings)
+    display_name = String(
+        help="Display name for this module", default="Empty",
+        display_name="Display Name", scope=Scope.settings)
     tabs = List(help="List of tabs to enable in this course", scope=Scope.settings)
     end_of_course_survey_url = String(help="Url for the end-of-course survey", scope=Scope.settings)
     discussion_blackouts = List(help="List of pairs of start/end dates for discussion blackouts", scope=Scope.settings)
@@ -175,7 +215,125 @@ class CourseFields(object):
     allow_anonymous_to_peers = Boolean(scope=Scope.settings, default=False)
     advanced_modules = List(help="Beta modules used in your course", scope=Scope.settings)
     has_children = True
-    checklists = List(scope=Scope.settings)
+    checklists = List(scope=Scope.settings,
+        default=[
+            {"short_description" : "Getting Started With Studio",
+             "items" : [{"short_description": "Add Course Team Members",
+                         "long_description": "Grant your collaborators permission to edit your course so you can work together.",
+                         "is_checked": False,
+                         "action_url": "ManageUsers",
+                         "action_text": "Edit Course Team",
+                         "action_external": False},
+                        {"short_description": "Set Important Dates for Your Course",
+                         "long_description": "Establish your course's student enrollment and launch dates on the Schedule and Details page.",
+                         "is_checked": False,
+                         "action_url": "SettingsDetails",
+                         "action_text": "Edit Course Details &amp; Schedule",
+                         "action_external": False},
+                         {"short_description": "Draft Your Course's Grading Policy",
+                         "long_description": "Set up your assignment types and grading policy even if you haven't created all your assignments.",
+                         "is_checked": False,
+                         "action_url": "SettingsGrading",
+                         "action_text": "Edit Grading Settings",
+                         "action_external": False},
+                         {"short_description": "Explore the Other Studio Checklists",
+                         "long_description": "Discover other available course authoring tools, and find help when you need it.",
+                         "is_checked": False,
+                         "action_url": "",
+                         "action_text": "",
+                         "action_external": False}]
+            },
+            {"short_description" : "Draft a Rough Course Outline",
+             "items" : [{"short_description": "Create Your First Section and Subsection",
+                          "long_description": "Use your course outline to build your first Section and Subsection.",
+                          "is_checked": False,
+                          "action_url": "CourseOutline",
+                          "action_text": "Edit Course Outline",
+                          "action_external": False},
+                         {"short_description": "Set Section Release Dates",
+                          "long_description": "Specify the release dates for each Section in your course. Sections become visible to students on their release dates.",
+                          "is_checked": False,
+                          "action_url": "CourseOutline",
+                          "action_text": "Edit Course Outline",
+                          "action_external": False},
+                          {"short_description": "Designate a Subsection as Graded",
+                          "long_description": "Set a Subsection to be graded as a specific assignment type. Assignments within graded Subsections count toward a student's final grade.",
+                          "is_checked": False,
+                          "action_url": "CourseOutline",
+                          "action_text": "Edit Course Outline",
+                          "action_external": False},
+                          {"short_description": "Reordering Course Content",
+                          "long_description": "Use drag and drop to reorder the content in your course.",
+                          "is_checked": False,
+                          "action_url": "CourseOutline",
+                          "action_text": "Edit Course Outline",
+                          "action_external": False},
+                          {"short_description": "Renaming Sections",
+                          "long_description": "Rename Sections by clicking the Section name from the Course Outline.",
+                          "is_checked": False,
+                          "action_url": "CourseOutline",
+                          "action_text": "Edit Course Outline",
+                          "action_external": False},
+                          {"short_description": "Deleting Course Content",
+                          "long_description": "Delete Sections, Subsections, or Units you don't need anymore. Be careful, as there is no Undo function.",
+                          "is_checked": False,
+                          "action_url": "CourseOutline",
+                          "action_text": "Edit Course Outline",
+                          "action_external": False},
+                          {"short_description": "Add an Instructor-Only Section to Your Outline",
+                          "long_description": "Some course authors find using a section for unsorted, in-progress work useful. To do this, create a section and set the release date to the distant future.",
+                          "is_checked": False,
+                          "action_url": "CourseOutline",
+                          "action_text": "Edit Course Outline",
+                          "action_external": False}]
+            },
+            {"short_description" : "Explore edX's Support Tools",
+             "items" : [{"short_description": "Explore the Studio Help Forum",
+                          "long_description": "Access the Studio Help forum from the menu that appears when you click your user name in the top right corner of Studio.",
+                          "is_checked": False,
+                          "action_url": "http://help.edge.edx.org/",
+                          "action_text": "Visit Studio Help",
+                          "action_external": True},
+                         {"short_description": "Enroll in edX 101",
+                          "long_description": "Register for edX 101, edX's primer for course creation.",
+                          "is_checked": False,
+                          "action_url": "https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/about",
+                          "action_text": "Register for edX 101",
+                          "action_external": True},
+                          {"short_description": "Download the Studio Documentation",
+                          "long_description": "Download the searchable Studio reference documentation in PDF form.",
+                          "is_checked": False,
+                          "action_url": "http://files.edx.org/Getting_Started_with_Studio.pdf",
+                          "action_text": "Download Documentation",
+                          "action_external": True}]
+            },
+            {"short_description" : "Draft Your Course About Page",
+             "items" : [{"short_description": "Draft a Course Description",
+                          "long_description": "Courses on edX have an About page that includes a course video, description, and more. Draft the text students will read before deciding to enroll in your course.",
+                          "is_checked": False,
+                          "action_url": "SettingsDetails",
+                          "action_text": "Edit Course Schedule &amp; Details",
+                          "action_external": False},
+                         {"short_description": "Add Staff Bios",
+                          "long_description": "Showing prospective students who their instructor will be is helpful. Include staff bios on the course About page.",
+                          "is_checked": False,
+                          "action_url": "SettingsDetails",
+                          "action_text": "Edit Course Schedule &amp; Details",
+                          "action_external": False},
+                          {"short_description": "Add Course FAQs",
+                          "long_description": "Include a short list of frequently asked questions about your course.",
+                          "is_checked": False,
+                          "action_url": "SettingsDetails",
+                          "action_text": "Edit Course Schedule &amp; Details",
+                          "action_external": False},
+                          {"short_description": "Add Course Prerequisites",
+                          "long_description": "Let students know what knowledge and/or skills they should have before they enroll in your course.",
+                          "is_checked": False,
+                          "action_url": "SettingsDetails",
+                          "action_text": "Edit Course Schedule &amp; Details",
+                          "action_external": False}]
+            }
+        ])
     info_sidebar_name = String(scope=Scope.settings, default='Course Handouts')
     show_timezone = Boolean(help="True if timezones should be shown on dates in the courseware", scope=Scope.settings, default=True)
     enrollment_domain = String(help="External login method associated with user accounts allowed to register in course",
@@ -220,18 +378,16 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
             self.wiki_slug = self.location.course
 
         msg = None
-        if self.start is None:
-            msg = "Course loaded without a valid start date. id = %s" % self.id
-            self.start = datetime.now(UTC())
-            log.critical(msg)
-            self.system.error_tracker(msg)
 
         # NOTE: relies on the modulestore to call set_grading_policy() right after
         # init.  (Modulestore is in charge of figuring out where to load the policy from)
 
         # NOTE (THK): This is a last-minute addition for Fall 2012 launch to dynamically
         #   disable the syllabus content for courses that do not provide a syllabus
-        self.syllabus_present = self.system.resources_fs.exists(path('syllabus'))
+        if self.system.resources_fs is None:
+            self.syllabus_present = False
+        else:
+            self.syllabus_present = self.system.resources_fs.exists(path('syllabus'))
         self._grading_policy = {}
 
         self.set_grading_policy(self.grading_policy)
@@ -252,42 +408,33 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
                     log.error(msg)
                     continue
 
-    def default_grading_policy(self):
-        """
-        Return a dict which is a copy of the default grading policy
-        """
-        return {"GRADER": [
-                {
-                    "type": "Homework",
-                    "min_count": 12,
-                    "drop_count": 2,
-                    "short_label": "HW",
-                    "weight": 0.15
-                },
-                {
-                    "type": "Lab",
-                    "min_count": 12,
-                    "drop_count": 2,
-                    "weight": 0.15
-                },
-                {
-                    "type": "Midterm Exam",
-                    "short_label": "Midterm",
-                    "min_count": 1,
-                    "drop_count": 0,
-                    "weight": 0.3
-                },
-                {
-                    "type": "Final Exam",
-                    "short_label": "Final",
-                    "min_count": 1,
-                    "drop_count": 0,
-                    "weight": 0.4
-                }
-            ],
-            "GRADE_CUTOFFS": {
-                "Pass": 0.5
-            }}
+        # TODO check that this is still needed here and can't be by defaults.
+        if self.tabs is None:
+            # When calling the various _tab methods, can omit the 'type':'blah' from the
+            # first arg, since that's only used for dispatch
+            tabs = []
+            tabs.append({'type': 'courseware'})
+            tabs.append({'type': 'course_info', 'name': 'Course Info'})
+
+            if self.syllabus_present:
+                tabs.append({'type': 'syllabus'})
+
+            tabs.append({'type': 'textbooks'})
+
+            # # If they have a discussion link specified, use that even if we feature
+            # # flag discussions off. Disabling that is mostly a server safety feature
+            # # at this point, and we don't need to worry about external sites.
+            if self.discussion_link:
+                tabs.append({'type': 'external_discussion', 'link': self.discussion_link})
+            else:
+                tabs.append({'type': 'discussion', 'name': 'Discussion'})
+
+            tabs.append({'type': 'wiki', 'name': 'Wiki'})
+
+            if not self.hide_progress_tab:
+                tabs.append({'type': 'progress', 'name': 'Progress'})
+
+            self.tabs = tabs
 
     def set_grading_policy(self, course_policy):
         """
@@ -298,7 +445,13 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
             course_policy = {}
 
         # Load the global settings as a dictionary
-        grading_policy = self.default_grading_policy()
+        grading_policy = self.grading_policy
+        # BOY DO I HATE THIS grading_policy CODE ACROBATICS YET HERE I ADD MORE (dhm)--this fixes things persisted w/
+        # defective grading policy values (but not None)
+        if 'GRADER' not in grading_policy:
+            grading_policy['GRADER'] = CourseFields.grading_policy.default['GRADER']
+        if 'GRADE_CUTOFFS' not in grading_policy:
+            grading_policy['GRADE_CUTOFFS'] = CourseFields.grading_policy.default['GRADE_CUTOFFS']
 
         # Override any global settings with the course settings
         grading_policy.update(course_policy)
@@ -354,10 +507,6 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
             system.error_tracker("Unable to decode grading policy as json")
             policy = {}
 
-        # cdodge: import the grading policy information that is on disk and put into the
-        # descriptor 'definition' bucket as a dictionary so that it is persisted in the DB
-        instance.grading_policy = policy
-
         # now set the current instance. set_grading_policy() will apply some inheritance rules
         instance.set_grading_policy(policy)
 
@@ -661,6 +810,7 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
         if isinstance(self.advertised_start, basestring):
             return try_parse_iso_8601(self.advertised_start)
         elif self.advertised_start is None and self.start is None:
+            # TODO this is an impossible state since the init function forces start to have a value
             return 'TBD'
         else:
             return (self.advertised_start or self.start).strftime("%b %d, %Y")
diff --git a/common/lib/xmodule/xmodule/discussion_module.py b/common/lib/xmodule/xmodule/discussion_module.py
index aef4821839..fac6a498e5 100644
--- a/common/lib/xmodule/xmodule/discussion_module.py
+++ b/common/lib/xmodule/xmodule/discussion_module.py
@@ -4,17 +4,27 @@ from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
 from xmodule.editing_module import MetadataOnlyEditingDescriptor
 from xblock.core import String, Scope
+from uuid import uuid4
 
 
 class DiscussionFields(object):
-    discussion_id = String(scope=Scope.settings)
+    discussion_id = String(scope=Scope.settings, default="$$GUID$$")
+    display_name = String(
+        display_name="Display Name",
+        help="Display name for this module",
+        default="Discussion Tag",
+        scope=Scope.settings)
+    data = String(help="XML data for the problem", scope=Scope.content,
+        default="<discussion></discussion>")
     discussion_category = String(
         display_name="Category",
+        default="Week 1",
         help="A category name for the discussion. This name appears in the left pane of the discussion forum for the course.",
         scope=Scope.settings
     )
     discussion_target = String(
         display_name="Subcategory",
+        default="Topic-Level Student-Visible Label",
         help="A subcategory name for the discussion. This name appears in the left pane of the discussion forum for the course.",
         scope=Scope.settings
     )
@@ -36,9 +46,15 @@ class DiscussionModule(DiscussionFields, XModule):
 
 
 class DiscussionDescriptor(DiscussionFields, MetadataOnlyEditingDescriptor, RawDescriptor):
-    module_class = DiscussionModule
-    template_dir_name = "discussion"
 
+    def __init__(self, *args, **kwargs):
+        super(DiscussionDescriptor, self).__init__(*args, **kwargs)
+        # is this too late? i.e., will it get persisted and stay static w/ the first value
+        # any code references. I believe so.
+        if self.discussion_id == '$$GUID$$':
+            self.discussion_id = uuid4().hex
+
+    module_class = DiscussionModule
     # The discussion XML format uses `id` and `for` attributes,
     # but these would overload other module attributes, so we prefix them
     # for actual use in the code
diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index 0f7e789906..9ff2e4d9a8 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -13,12 +13,21 @@ from xmodule.html_checker import check_html
 from xmodule.stringify import stringify_children
 from xmodule.x_module import XModule
 from xmodule.xml_module import XmlDescriptor, name_to_pathname
+import textwrap
 
 log = logging.getLogger("mitx.courseware")
 
 
 class HtmlFields(object):
-    data = String(help="Html contents to display for this module", scope=Scope.content)
+    display_name = String(
+        display_name="Display Name",
+        help="This name appears in the horizontal navigation at the top of the page.",
+        scope=Scope.settings,
+        # it'd be nice to have a useful default but it screws up other things; so,
+        # use display_name_with_default for those
+        default="Blank HTML Page"
+    )
+    data = String(help="Html contents to display for this module", default="", scope=Scope.content)
     source_code = String(help="Source code for LaTeX documents. This feature is not well-supported.", scope=Scope.settings)
 
 
@@ -32,7 +41,7 @@ class HtmlModule(HtmlFields, XModule):
     css = {'scss': [resource_string(__name__, 'css/html/display.scss')]}
 
     def get_html(self):
-        if self.system.anonymous_student_id: 
+        if self.system.anonymous_student_id:
             return self.data.replace("%%USER_ID%%", self.system.anonymous_student_id)
         return self.data
 
@@ -169,26 +178,88 @@ class HtmlDescriptor(HtmlFields, XmlDescriptor, EditingDescriptor):
         elt.set("filename", relname)
         return elt
 
+class AboutFields(object):
+    display_name = String(
+        help="Display name for this module",
+        scope=Scope.settings,
+        default="overview",
+    )
+    data = String(
+        help="Html contents to display for this module",
+        default="",
+        scope=Scope.content
+    )
 
-class AboutDescriptor(HtmlDescriptor):
+class AboutModule(AboutFields, HtmlModule):
+    """
+    Overriding defaults but otherwise treated as HtmlModule.
+    """
+    pass
+
+class AboutDescriptor(AboutFields, HtmlDescriptor):
     """
     These pieces of course content are treated as HtmlModules but we need to overload where the templates are located
     in order to be able to create new ones
     """
     template_dir_name = "about"
+    module_class = AboutModule
+
+class StaticTabFields(object):
+    """
+    The overrides for Static Tabs
+    """
+    display_name = String(
+        display_name="Display Name",
+        help="This name appears in the horizontal navigation at the top of the page.",
+        scope=Scope.settings,
+        default="Empty",
+    )
+    data = String(
+        default=textwrap.dedent("""\
+            <p>This is where you can add additional pages to your courseware. Click the 'edit' button to begin editing.</p>
+        """),
+        scope=Scope.content,
+        help="HTML for the additional pages"
+    )
 
 
-class StaticTabDescriptor(HtmlDescriptor):
+class StaticTabModule(StaticTabFields, HtmlModule):
+    """
+    Supports the field overrides
+    """
+    pass
+
+class StaticTabDescriptor(StaticTabFields, HtmlDescriptor):
     """
     These pieces of course content are treated as HtmlModules but we need to overload where the templates are located
     in order to be able to create new ones
     """
     template_dir_name = "statictab"
+    module_class = StaticTabModule
 
 
-class CourseInfoDescriptor(HtmlDescriptor):
+class CourseInfoFields(object):
+    """
+    Field overrides
+    """
+    data = String(
+        help="Html contents to display for this module",
+        default="<ol></ol>",
+        scope=Scope.content
+    )
+
+
+class CourseInfoModule(CourseInfoFields, HtmlModule):
+    """
+    Just to support xblock field overrides
+    """
+    pass
+
+
+class CourseInfoDescriptor(CourseInfoFields, HtmlDescriptor):
     """
     These pieces of course content are treated as HtmlModules but we need to overload where the templates are located
     in order to be able to create new ones
     """
     template_dir_name = "courseinfo"
+    module_class = CourseInfoModule
diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py
index 7df444a892..c88a2e1b38 100644
--- a/common/lib/xmodule/xmodule/peer_grading_module.py
+++ b/common/lib/xmodule/xmodule/peer_grading_module.py
@@ -59,6 +59,15 @@ class PeerGradingFields(object):
         help="Defines the number of points each problem is worth. If the value is not set, each problem is worth one point.",
         scope=Scope.settings, values={"min": 0, "step": ".1"}
     )
+    display_name = String(
+        display_name="Display Name",
+        help="Display name for this module",
+        scope=Scope.settings,
+        default="Peer Grading Interface"
+    )
+    data = String(help="Html contents to display for this module",
+        default='<peergrading></peergrading>',
+        scope=Scope.content)
 
 
 class PeerGradingModule(PeerGradingFields, XModule):
diff --git a/common/lib/xmodule/xmodule/raw_module.py b/common/lib/xmodule/xmodule/raw_module.py
index 554be73926..4c6c719224 100644
--- a/common/lib/xmodule/xmodule/raw_module.py
+++ b/common/lib/xmodule/xmodule/raw_module.py
@@ -13,7 +13,7 @@ class RawDescriptor(XmlDescriptor, XMLEditingDescriptor):
     Module that provides a raw editing view of its data and children.  It
     requires that the definition xml is valid.
     """
-    data = String(help="XML data for the module", scope=Scope.content)
+    data = String(help="XML data for the module", default="", scope=Scope.content)
 
     @classmethod
     def definition_from_xml(cls, xml_object, system):
diff --git a/common/lib/xmodule/xmodule/templates/about/empty.yaml b/common/lib/xmodule/xmodule/templates/about/empty.yaml
index fa3ed606bd..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/about/empty.yaml
+++ b/common/lib/xmodule/xmodule/templates/about/empty.yaml
@@ -1,5 +1 @@
----
-metadata:
-    display_name: Empty
-data: "<p>This is where you can add additional information about your course.</p>"
-children: []
\ No newline at end of file
+{}
diff --git a/common/lib/xmodule/xmodule/templates/about/overview.yaml b/common/lib/xmodule/xmodule/templates/about/overview.yaml
index 0031ebffaf..9b2e895526 100644
--- a/common/lib/xmodule/xmodule/templates/about/overview.yaml
+++ b/common/lib/xmodule/xmodule/templates/about/overview.yaml
@@ -3,51 +3,50 @@ metadata:
     display_name: overview
 
 data: |
-               <section class="about">
-                  <h2>About This Course</h2>
-                  <p>Include your long course description here. The long course description should contain 150-400 words.</p>
+    <section class="about">
+      <h2>About This Course</h2>
+      <p>Include your long course description here. The long course description should contain 150-400 words.</p>
 
-                  <p>This is paragraph 2 of the long course description. Add more paragraphs as needed. Make sure to enclose them in paragraph tags.</p>
-                </section>
+      <p>This is paragraph 2 of the long course description. Add more paragraphs as needed. Make sure to enclose them in paragraph tags.</p>
+    </section>
 
-                <section class="prerequisites">
-                  <h2>Prerequisites</h2>
-                  <p>Add information about course prerequisites here.</p>
-                </section>
+    <section class="prerequisites">
+      <h2>Prerequisites</h2>
+      <p>Add information about course prerequisites here.</p>
+    </section>
 
-                <section class="course-staff">
-                  <h2>Course Staff</h2>
-                  <article class="teacher">
-                    <div class="teacher-image">
-                      <img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0">
-                    </div>
+    <section class="course-staff">
+      <h2>Course Staff</h2>
+      <article class="teacher">
+        <div class="teacher-image">
+          <img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0">
+        </div>
 
-                    <h3>Staff Member #1</h3>
-                    <p>Biography of instructor/staff member #1</p>
-                  </article>
+        <h3>Staff Member #1</h3>
+        <p>Biography of instructor/staff member #1</p>
+      </article>
 
-                  <article class="teacher">
-                    <div class="teacher-image">
-                      <img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0">
-                    </div>
+      <article class="teacher">
+        <div class="teacher-image">
+          <img src="/static/images/pl-faculty.png" align="left" style="margin:0 20 px 0">
+        </div>
 
-                    <h3>Staff Member #2</h3>
-                    <p>Biography of instructor/staff member #2</p>
-                  </article>
-                </section>
+        <h3>Staff Member #2</h3>
+        <p>Biography of instructor/staff member #2</p>
+      </article>
+    </section>
 
-                <section class="faq">
-                  <section class="responses">
-                    <h2>Frequently Asked Questions</h2>
-                    <article class="response">
-                      <h3>Do I need to buy a textbook?</h3>
-                      <p>No, a free online version of Chemistry: Principles, Patterns, and Applications, First Edition by Bruce Averill and Patricia Eldredge will be available, though you can purchase a printed version (published by FlatWorld Knowledge) if you’d like.</p>
-                    </article>
+    <section class="faq">
+      <section class="responses">
+        <h2>Frequently Asked Questions</h2>
+        <article class="response">
+          <h3>Do I need to buy a textbook?</h3>
+          <p>No, a free online version of Chemistry: Principles, Patterns, and Applications, First Edition by Bruce Averill and Patricia Eldredge will be available, though you can purchase a printed version (published by FlatWorld Knowledge) if you’d like.</p>
+        </article>
 
-                    <article class="response">
-                      <h3>Question #2</h3>
-                      <p>Your answer would be displayed here.</p>
-                    </article>
-                  </section>
-                </section>
-children: []
+        <article class="response">
+          <h3>Question #2</h3>
+          <p>Your answer would be displayed here.</p>
+        </article>
+      </section>
+    </section>
diff --git a/common/lib/xmodule/xmodule/templates/annotatable/default.yaml b/common/lib/xmodule/xmodule/templates/annotatable/default.yaml
index 31dd489fb4..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/annotatable/default.yaml
+++ b/common/lib/xmodule/xmodule/templates/annotatable/default.yaml
@@ -1,20 +1 @@
----
-metadata:
-    display_name: 'Annotation'
-data: |
-    <annotatable>
-        <instructions>
-            <p>Enter your (optional) instructions for the exercise in HTML format.</p>
-            <p>Annotations are specified by an <code>&lt;annotation&gt;</code> tag which may may have the following attributes:</p>
-            <ul class="instructions-template">
-                <li><code>title</code> (optional). Title of the annotation. Defaults to <i>Commentary</i> if omitted.</li>
-                <li><code>body</code> (<b>required</b>). Text of the annotation.</li>
-                <li><code>problem</code> (optional). Numeric index of the problem associated with this annotation. This is a zero-based index, so the first problem on the page would have <code>problem="0"</code>.</li>
-                <li><code>highlight</code> (optional). Possible values: yellow, red, orange, green, blue, or purple. Defaults to yellow if this attribute is omitted.</li>
-            </ul>
-        </instructions>
-        <p>Add your HTML with annotation spans here.</p>
-        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. <annotation title="My title" body="My comment" highlight="yellow" problem="0">Ut sodales laoreet est, egestas gravida felis egestas nec.</annotation> Aenean at volutpat erat. Cras commodo viverra nibh in aliquam.</p> 
-        <p>Nulla facilisi. <annotation body="Basic annotation example." problem="1">Pellentesque id vestibulum libero.</annotation> Suspendisse potenti. Morbi scelerisque nisi vitae felis dictum mattis. Nam sit amet magna elit. Nullam volutpat cursus est, sit amet sagittis odio vulputate et. Curabitur euismod, orci in vulputate imperdiet, augue lorem tempor purus, id aliquet augue turpis a est. Aenean a sagittis libero. Praesent fringilla pretium magna, non condimentum risus elementum nec. Pellentesque faucibus elementum pharetra. Pellentesque vitae metus eros.</p>
-    </annotatable>
-children: []
+{}
diff --git a/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml b/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
index f7d639ebfb..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
+++ b/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
@@ -1,37 +1 @@
----
-metadata:
-    display_name: Open Ended Response
-    markdown: ""
-data: |
-  <combinedopenended>
-  	<rubric>
-  		<rubric>
-  		    <category>
-              <description>Category 1</description>
-              <option>
-                  The response does not incorporate what is needed for a one response.
-              </option>
-              <option>
-                  The response is correct for category 1.
-              </option>
-  		    </category>
-  		</rubric>
-  	</rubric>
-  	<prompt>
-  		<p>Why is the sky blue?</p>
-  	</prompt>
-  	<task>
-  		<selfassessment/>
-  	</task>
-  	<task>
-  		<openended min_score_to_attempt="1" max_score_to_attempt="2">
-  		        <openendedparam>
-  		      		<initial_display>Enter essay here.</initial_display>
-  		      		<answer_display>This is the answer.</answer_display>
-  		      		<grader_payload>{"grader_settings" : "peer_grading.conf", "problem_id" : "700x/Demo"}</grader_payload>
-  		    	</openendedparam>
-  		</openended>
-  	</task>
-  </combinedopenended>
-
-children: []
+{}
diff --git a/common/lib/xmodule/xmodule/templates/course/empty.yaml b/common/lib/xmodule/xmodule/templates/course/empty.yaml
index 89f1bfcf21..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/course/empty.yaml
+++ b/common/lib/xmodule/xmodule/templates/course/empty.yaml
@@ -1,124 +1 @@
----
-metadata:
-    display_name: Empty
-    start: 2020-10-10T10:00
-    checklists: [
-        {"short_description" : "Getting Started With Studio",
-         "items" : [{"short_description": "Add Course Team Members",
-                     "long_description": "Grant your collaborators permission to edit your course so you can work together.",
-                     "is_checked": false,
-                     "action_url": "ManageUsers",
-                     "action_text": "Edit Course Team",
-                     "action_external": false},
-                    {"short_description": "Set Important Dates for Your Course",
-                     "long_description": "Establish your course's student enrollment and launch dates on the Schedule and Details page.",
-                     "is_checked": false,
-                     "action_url": "SettingsDetails",
-                     "action_text": "Edit Course Details &amp; Schedule",
-                     "action_external": false},
-                     {"short_description": "Draft Your Course's Grading Policy",
-                     "long_description": "Set up your assignment types and grading policy even if you haven't created all your assignments.",
-                     "is_checked": false,
-                     "action_url": "SettingsGrading",
-                     "action_text": "Edit Grading Settings",
-                     "action_external": false},
-                     {"short_description": "Explore the Other Studio Checklists",
-                     "long_description": "Discover other available course authoring tools, and find help when you need it.",
-                     "is_checked": false,
-                     "action_url": "",
-                     "action_text": "",
-                     "action_external": false}]
-        },
-        {"short_description" : "Draft a Rough Course Outline",
-         "items" : [{"short_description": "Create Your First Section and Subsection",
-                      "long_description": "Use your course outline to build your first Section and Subsection.",
-                      "is_checked": false,
-                      "action_url": "CourseOutline",
-                      "action_text": "Edit Course Outline",
-                      "action_external": false},
-                     {"short_description": "Set Section Release Dates",
-                      "long_description": "Specify the release dates for each Section in your course. Sections become visible to students on their release dates.",
-                      "is_checked": false,
-                      "action_url": "CourseOutline",
-                      "action_text": "Edit Course Outline",
-                      "action_external": false},
-                      {"short_description": "Designate a Subsection as Graded",
-                      "long_description": "Set a Subsection to be graded as a specific assignment type. Assignments within graded Subsections count toward a student's final grade.",
-                      "is_checked": false,
-                      "action_url": "CourseOutline",
-                      "action_text": "Edit Course Outline",
-                      "action_external": false},
-                      {"short_description": "Reordering Course Content",
-                      "long_description": "Use drag and drop to reorder the content in your course.",
-                      "is_checked": false,
-                      "action_url": "CourseOutline",
-                      "action_text": "Edit Course Outline",
-                      "action_external": false},
-                      {"short_description": "Renaming Sections",
-                      "long_description": "Rename Sections by clicking the Section name from the Course Outline.",
-                      "is_checked": false,
-                      "action_url": "CourseOutline",
-                      "action_text": "Edit Course Outline",
-                      "action_external": false},
-                      {"short_description": "Deleting Course Content",
-                      "long_description": "Delete Sections, Subsections, or Units you don't need anymore. Be careful, as there is no Undo function.",
-                      "is_checked": false,
-                      "action_url": "CourseOutline",
-                      "action_text": "Edit Course Outline",
-                      "action_external": false},
-                      {"short_description": "Add an Instructor-Only Section to Your Outline",
-                      "long_description": "Some course authors find using a section for unsorted, in-progress work useful. To do this, create a section and set the release date to the distant future.",
-                      "is_checked": false,
-                      "action_url": "CourseOutline",
-                      "action_text": "Edit Course Outline",
-                      "action_external": false}]
-        },
-        {"short_description" : "Explore edX's Support Tools",
-         "items" : [{"short_description": "Explore the Studio Help Forum",
-                      "long_description": "Access the Studio Help forum from the menu that appears when you click your user name in the top right corner of Studio.",
-                      "is_checked": false,
-                      "action_url": "http://help.edge.edx.org/",
-                      "action_text": "Visit Studio Help",
-                      "action_external": true},
-                     {"short_description": "Enroll in edX 101",
-                      "long_description": "Register for edX 101, edX's primer for course creation.",
-                      "is_checked": false,
-                      "action_url": "https://edge.edx.org/courses/edX/edX101/How_to_Create_an_edX_Course/about",
-                      "action_text": "Register for edX 101",
-                      "action_external": true},
-                      {"short_description": "Download the Studio Documentation",
-                      "long_description": "Download the searchable Studio reference documentation in PDF form.",
-                      "is_checked": false,
-                      "action_url": "http://files.edx.org/Getting_Started_with_Studio.pdf",
-                      "action_text": "Download Documentation",
-                      "action_external": true}]
-        },
-        {"short_description" : "Draft Your Course About Page",
-         "items" : [{"short_description": "Draft a Course Description",
-                      "long_description": "Courses on edX have an About page that includes a course video, description, and more. Draft the text students will read before deciding to enroll in your course.",
-                      "is_checked": false,
-                      "action_url": "SettingsDetails",
-                      "action_text": "Edit Course Schedule &amp; Details",
-                      "action_external": false},
-                     {"short_description": "Add Staff Bios",
-                      "long_description": "Showing prospective students who their instructor will be is helpful. Include staff bios on the course About page.",
-                      "is_checked": false,
-                      "action_url": "SettingsDetails",
-                      "action_text": "Edit Course Schedule &amp; Details",
-                      "action_external": false},
-                      {"short_description": "Add Course FAQs",
-                      "long_description": "Include a short list of frequently asked questions about your course.",
-                      "is_checked": false,
-                      "action_url": "SettingsDetails",
-                      "action_text": "Edit Course Schedule &amp; Details",
-                      "action_external": false},
-                      {"short_description": "Add Course Prerequisites",
-                      "long_description": "Let students know what knowledge and/or skills they should have before they enroll in your course.",
-                      "is_checked": false,
-                      "action_url": "SettingsDetails",
-                      "action_text": "Edit Course Schedule &amp; Details",
-                      "action_external": false}]
-        }
-    ]
-data: { 'textbooks' : [ ], 'wiki_slug' : null }
-children: []
+{}
diff --git a/common/lib/xmodule/xmodule/templates/courseinfo/empty.yaml b/common/lib/xmodule/xmodule/templates/courseinfo/empty.yaml
index c6958ed887..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/courseinfo/empty.yaml
+++ b/common/lib/xmodule/xmodule/templates/courseinfo/empty.yaml
@@ -1,5 +1 @@
----
-metadata:
-    display_name: Empty
-data: "<ol></ol>"
-children: []
\ No newline at end of file
+{}
diff --git a/common/lib/xmodule/xmodule/templates/default/empty.yaml b/common/lib/xmodule/xmodule/templates/default/empty.yaml
index a2fb2b5832..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/default/empty.yaml
+++ b/common/lib/xmodule/xmodule/templates/default/empty.yaml
@@ -1,5 +1 @@
----
-metadata:
-    display_name: Empty
-data: ""
-children: []
+{}
diff --git a/common/lib/xmodule/xmodule/templates/discussion/default.yaml b/common/lib/xmodule/xmodule/templates/discussion/default.yaml
index 049e34b3e7..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/discussion/default.yaml
+++ b/common/lib/xmodule/xmodule/templates/discussion/default.yaml
@@ -1,9 +1 @@
----
-metadata:
-    display_name: Discussion Tag
-    for: Topic-Level Student-Visible Label 
-    id: $$GUID$$
-    discussion_category: Week 1
-data: |
-  <discussion />
-children: []
+{}
diff --git a/common/lib/xmodule/xmodule/templates/html/announcement.yaml b/common/lib/xmodule/xmodule/templates/html/announcement.yaml
index 82fe8fbc03..30a8ccb41e 100644
--- a/common/lib/xmodule/xmodule/templates/html/announcement.yaml
+++ b/common/lib/xmodule/xmodule/templates/html/announcement.yaml
@@ -1,7 +1,6 @@
 ---
 metadata:
-      display_name: Announcement
-
+    display_name: Announcement
 data: |
       <ol>
       <li>  
diff --git a/common/lib/xmodule/xmodule/templates/html/empty.yaml b/common/lib/xmodule/xmodule/templates/html/empty.yaml
index 40b005af28..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/html/empty.yaml
+++ b/common/lib/xmodule/xmodule/templates/html/empty.yaml
@@ -1,7 +1 @@
----
-metadata:
-    display_name: Blank HTML Page
-
-data: |
-
-children: []
\ No newline at end of file
+{}
diff --git a/common/lib/xmodule/xmodule/templates/html/latex_html.yaml b/common/lib/xmodule/xmodule/templates/html/latex_html.yaml
index ff92f2aead..ba5c4b5c06 100644
--- a/common/lib/xmodule/xmodule/templates/html/latex_html.yaml
+++ b/common/lib/xmodule/xmodule/templates/html/latex_html.yaml
@@ -1,16 +1,16 @@
 ---
 metadata:
     display_name: E-text Written in LaTeX
-    source_code: |
-        \subsection{Example of E-text in LaTeX}
+source_code: |
+    \subsection{Example of E-text in LaTeX}
 
-        It is very convenient to write complex equations in LaTeX.        
+    It is very convenient to write complex equations in LaTeX.        
 
-        \begin{equation}
-                x = \frac{-b\pm\sqrt{b^2-4*a*c}}{2a}
-        \end{equation}
+    \begin{equation}
+            x = \frac{-b\pm\sqrt{b^2-4*a*c}}{2a}
+    \end{equation}
 
-        Seize the moment.
+    Seize the moment.
 
 data: |
     <html>
diff --git a/common/lib/xmodule/xmodule/templates/peer_grading/default.yaml b/common/lib/xmodule/xmodule/templates/peer_grading/default.yaml
index 5d88a18ad8..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/peer_grading/default.yaml
+++ b/common/lib/xmodule/xmodule/templates/peer_grading/default.yaml
@@ -1,9 +1 @@
----
-metadata:
-    display_name: Peer Grading Interface
-    max_grade: 1
-data: |
-  <peergrading>
-  </peergrading>
-
-children: []
+{}
diff --git a/common/lib/xmodule/xmodule/templates/problem/blank_common.yaml b/common/lib/xmodule/xmodule/templates/problem/blank_common.yaml
new file mode 100644
index 0000000000..3dcac29aba
--- /dev/null
+++ b/common/lib/xmodule/xmodule/templates/problem/blank_common.yaml
@@ -0,0 +1,5 @@
+---
+metadata:
+    display_name: Blank Common Problem
+    markdown: ""
+data: "<problem></problem>"
diff --git a/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml b/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml
index 56f802a6a3..3b051f2ba8 100644
--- a/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml
@@ -5,59 +5,58 @@ metadata:
     rerandomize: never
     showanswer: finished
 data: |
-  <problem >
-    Please make a voltage divider that splits the provided voltage evenly.
-
-  <schematicresponse>
-  <center>
-  <schematic height="500" width="600" parts="g,r" analyses="dc"
-  initial_value="[[&quot;v&quot;,[168,144,0],{&quot;value&quot;:&quot;dc(1)&quot;,&quot;_json_&quot;:0},[&quot;1&quot;,&quot;0&quot;]],[&quot;r&quot;,[296,120,0],{&quot;r&quot;:&quot;1&quot;,&quot;_json_&quot;:1},[&quot;1&quot;,&quot;output&quot;]],[&quot;L&quot;,[296,168,3],{&quot;label&quot;:&quot;output&quot;,&quot;_json_&quot;:2},[&quot;output&quot;]],[&quot;w&quot;,[296,216,168,216]],[&quot;w&quot;,[168,216,168,192]],[&quot;w&quot;,[168,144,168,120]],[&quot;w&quot;,[168,120,296,120]],[&quot;g&quot;,[168,216,0],{&quot;_json_&quot;:7},[&quot;0&quot;]],[&quot;view&quot;,-67.49999999999994,-78.49999999999994,1.6000000000000003,&quot;50&quot;,&quot;10&quot;,&quot;1G&quot;,null,&quot;100&quot;,&quot;1&quot;,&quot;1000&quot;]]"
-  />
-  </center>
-  <answer type="loncapa/python">
-  dc_value = "dc analysis not found"
-  for response in submission[0]:
-    if response[0] == 'dc':
-        for node in response[1:]:
-            dc_value = node['output']
-
-  if dc_value == .5:
-    correct = ['correct']
-  else:
-    correct = ['incorrect']
-  </answer>
-  </schematicresponse>
-  <schematicresponse>
-  <p>Make a high pass filter</p>
-  <center>
-  <schematic height="500" width="600" parts="g,r,s,c" analyses="ac"
-  submit_analyses="{&quot;ac&quot;:[[&quot;NodeA&quot;,1,9]]}"
-  initial_value="[[&quot;v&quot;,[160,152,0],{&quot;name&quot;:&quot;v1&quot;,&quot;value&quot;:&quot;sin(0,1,1,0,0)&quot;,&quot;_json_&quot;:0},[&quot;1&quot;,&quot;0&quot;]],[&quot;w&quot;,[160,200,240,200]],[&quot;g&quot;,[160,200,0],{&quot;_json_&quot;:2},[&quot;0&quot;]],[&quot;L&quot;,[240,152,3],{&quot;label&quot;:&quot;NodeA&quot;,&quot;_json_&quot;:3},[&quot;NodeA&quot;]],[&quot;s&quot;,[240,152,0],{&quot;color&quot;:&quot;cyan&quot;,&quot;offset&quot;:&quot;0&quot;,&quot;_json_&quot;:4},[&quot;NodeA&quot;]],[&quot;view&quot;,64.55878906250004,54.114697265625054,2.5000000000000004,&quot;50&quot;,&quot;10&quot;,&quot;1G&quot;,null,&quot;100&quot;,&quot;1&quot;,&quot;1000&quot;]]"/>
-  </center>
-  <answer type="loncapa/python">
-  ac_values = None
-  for response in submission[0]:
-    if response[0] == 'ac':
-        for node in response[1:]:
-            ac_values = node['NodeA']
-  print "the ac analysis value:", ac_values
-  if ac_values == None:
-    correct = ['incorrect']
-  elif ac_values[0][1] &lt; ac_values[1][1]:
-    correct = ['correct']
-  else:
-    correct = ['incorrect']
-  </answer>
-  </schematicresponse>
-
-      <solution>
-          <div class="detailed-solution">
-              <p>Explanation</p>
-              <p>A voltage divider that evenly divides the input voltage can be formed with two identically valued resistors, with the sampled voltage taken in between the two.</p>
-              <p><img src="/static/images/voltage_divider.png"/></p>
-              <p>A simple high-pass filter without any further constaints can be formed by simply putting a resister in series with a capacitor. The actual values of the components do not really matter in order to meet the constraints of the problem.</p>
-              <p><img src="/static/images/high_pass_filter.png"/></p>
-          </div>
-      </solution>
-  </problem>
-children: []
+      <problem >
+        Please make a voltage divider that splits the provided voltage evenly.
+    
+      <schematicresponse>
+      <center>
+      <schematic height="500" width="600" parts="g,r" analyses="dc"
+      initial_value="[[&quot;v&quot;,[168,144,0],{&quot;value&quot;:&quot;dc(1)&quot;,&quot;_json_&quot;:0},[&quot;1&quot;,&quot;0&quot;]],[&quot;r&quot;,[296,120,0],{&quot;r&quot;:&quot;1&quot;,&quot;_json_&quot;:1},[&quot;1&quot;,&quot;output&quot;]],[&quot;L&quot;,[296,168,3],{&quot;label&quot;:&quot;output&quot;,&quot;_json_&quot;:2},[&quot;output&quot;]],[&quot;w&quot;,[296,216,168,216]],[&quot;w&quot;,[168,216,168,192]],[&quot;w&quot;,[168,144,168,120]],[&quot;w&quot;,[168,120,296,120]],[&quot;g&quot;,[168,216,0],{&quot;_json_&quot;:7},[&quot;0&quot;]],[&quot;view&quot;,-67.49999999999994,-78.49999999999994,1.6000000000000003,&quot;50&quot;,&quot;10&quot;,&quot;1G&quot;,null,&quot;100&quot;,&quot;1&quot;,&quot;1000&quot;]]"
+      />
+      </center>
+      <answer type="loncapa/python">
+      dc_value = "dc analysis not found"
+      for response in submission[0]:
+        if response[0] == 'dc':
+            for node in response[1:]:
+                dc_value = node['output']
+    
+      if dc_value == .5:
+        correct = ['correct']
+      else:
+        correct = ['incorrect']
+      </answer>
+      </schematicresponse>
+      <schematicresponse>
+      <p>Make a high pass filter</p>
+      <center>
+      <schematic height="500" width="600" parts="g,r,s,c" analyses="ac"
+      submit_analyses="{&quot;ac&quot;:[[&quot;NodeA&quot;,1,9]]}"
+      initial_value="[[&quot;v&quot;,[160,152,0],{&quot;name&quot;:&quot;v1&quot;,&quot;value&quot;:&quot;sin(0,1,1,0,0)&quot;,&quot;_json_&quot;:0},[&quot;1&quot;,&quot;0&quot;]],[&quot;w&quot;,[160,200,240,200]],[&quot;g&quot;,[160,200,0],{&quot;_json_&quot;:2},[&quot;0&quot;]],[&quot;L&quot;,[240,152,3],{&quot;label&quot;:&quot;NodeA&quot;,&quot;_json_&quot;:3},[&quot;NodeA&quot;]],[&quot;s&quot;,[240,152,0],{&quot;color&quot;:&quot;cyan&quot;,&quot;offset&quot;:&quot;0&quot;,&quot;_json_&quot;:4},[&quot;NodeA&quot;]],[&quot;view&quot;,64.55878906250004,54.114697265625054,2.5000000000000004,&quot;50&quot;,&quot;10&quot;,&quot;1G&quot;,null,&quot;100&quot;,&quot;1&quot;,&quot;1000&quot;]]"/>
+      </center>
+      <answer type="loncapa/python">
+      ac_values = None
+      for response in submission[0]:
+        if response[0] == 'ac':
+            for node in response[1:]:
+                ac_values = node['NodeA']
+      print "the ac analysis value:", ac_values
+      if ac_values == None:
+        correct = ['incorrect']
+      elif ac_values[0][1] &lt; ac_values[1][1]:
+        correct = ['correct']
+      else:
+        correct = ['incorrect']
+      </answer>
+      </schematicresponse>
+    
+          <solution>
+              <div class="detailed-solution">
+                  <p>Explanation</p>
+                  <p>A voltage divider that evenly divides the input voltage can be formed with two identically valued resistors, with the sampled voltage taken in between the two.</p>
+                  <p><img src="/static/images/voltage_divider.png"/></p>
+                  <p>A simple high-pass filter without any further constaints can be formed by simply putting a resister in series with a capacitor. The actual values of the components do not really matter in order to meet the constraints of the problem.</p>
+                  <p><img src="/static/images/high_pass_filter.png"/></p>
+              </div>
+          </solution>
+      </problem>
diff --git a/common/lib/xmodule/xmodule/templates/problem/empty.yaml b/common/lib/xmodule/xmodule/templates/problem/empty.yaml
index 97a2aef423..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/problem/empty.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/empty.yaml
@@ -1,11 +1 @@
----
-metadata:
-    display_name: Blank Common Problem
-    rerandomize: never
-    showanswer: finished
-    markdown: ""
-data: |
-  <problem>
-  </problem>
-
-children: []
+{}
diff --git a/common/lib/xmodule/xmodule/templates/statictab/empty.yaml b/common/lib/xmodule/xmodule/templates/statictab/empty.yaml
index 410e1496c2..9e26dfeeb6 100644
--- a/common/lib/xmodule/xmodule/templates/statictab/empty.yaml
+++ b/common/lib/xmodule/xmodule/templates/statictab/empty.yaml
@@ -1,5 +1 @@
----
-metadata:
-    display_name: Empty
-data: "<p>This is where you can add additional pages to your courseware. Click the 'edit' button to begin editing.</p>"
-children: []
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/templates/video/default.yaml b/common/lib/xmodule/xmodule/templates/video/default.yaml
index 048e7396c7..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/video/default.yaml
+++ b/common/lib/xmodule/xmodule/templates/video/default.yaml
@@ -1,5 +1 @@
----
-metadata:
-    display_name: default
-data: ""
-children: []
+{}
diff --git a/common/lib/xmodule/xmodule/templates/videoalpha/default.yaml b/common/lib/xmodule/xmodule/templates/videoalpha/default.yaml
index 1c25b272a3..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/videoalpha/default.yaml
+++ b/common/lib/xmodule/xmodule/templates/videoalpha/default.yaml
@@ -1,11 +1 @@
----
-metadata:
-    display_name: Video Alpha
-    version: 1
-data: |
-  <videoalpha show_captions="true" sub="name_of_file" youtube="0.75:JMD_ifUUfsU,1.0:OEoXaMPEzfM,1.25:AKqURZnYqpk,1.50:DYpADpL7jAY" >
-    <source src="https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.mp4"/>
-    <source src="https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.webm"/>
-    <source src="https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.ogv"/>
-  </videoalpha>
-children: []
+{}
diff --git a/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml b/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml
index 53e9eeaae4..0967ef424b 100644
--- a/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml
+++ b/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml
@@ -1,5 +1 @@
----
-metadata:
-    display_name: Word cloud
-data: {}
-children: []
+{}
diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index 3c6203107d..ebff888f34 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -21,6 +21,17 @@ log = logging.getLogger(__name__)
 
 class VideoFields(object):
     """Fields for `VideoModule` and `VideoDescriptor`."""
+    display_name = String(
+        display_name="Display Name",
+        help="This name appears in the horizontal navigation at the top of the page.",
+        scope=Scope.settings,
+        # it'd be nice to have a useful default but it screws up other things; so,
+        # use display_name_with_default for those
+        default="Video Title"
+    )
+    data = String(help="XML data for the problem",
+        default='',
+        scope=Scope.content)
     position = Integer(help="Current position in the video", scope=Scope.user_state, default=0)
     show_captions = Boolean(help="This controls whether or not captions are shown by default.", display_name="Show Captions", scope=Scope.settings, default=True)
     youtube_id_1_0 = String(help="This is the Youtube ID reference for the normal speed video.", display_name="Default Speed", scope=Scope.settings, default="OEoXaMPEzfM")
@@ -129,6 +140,10 @@ def _parse_video_xml(video, xml_data):
     display_name = xml.get('display_name')
     if display_name:
         video.display_name = display_name
+    elif video.url_name is not None:
+        # copies the logic of display_name_with_default in order that studio created videos will have an
+        # initial non guid name
+        video.display_name = video.url_name.replace('_', ' ')
 
     youtube = xml.get('youtube')
     if youtube:
diff --git a/common/lib/xmodule/xmodule/videoalpha_module.py b/common/lib/xmodule/xmodule/videoalpha_module.py
index 3b5b90e674..33945c33fc 100644
--- a/common/lib/xmodule/xmodule/videoalpha_module.py
+++ b/common/lib/xmodule/xmodule/videoalpha_module.py
@@ -28,15 +28,27 @@ from xblock.core import Integer, Scope, String
 
 import datetime
 import time
+import textwrap
 
 log = logging.getLogger(__name__)
 
 
 class VideoAlphaFields(object):
     """Fields for `VideoAlphaModule` and `VideoAlphaDescriptor`."""
-    data = String(help="XML data for the problem", scope=Scope.content)
+    data = String(help="XML data for the problem",
+                  default=textwrap.dedent('''\
+                       <videoalpha show_captions="true" sub="name_of_file" youtube="0.75:JMD_ifUUfsU,1.0:OEoXaMPEzfM,1.25:AKqURZnYqpk,1.50:DYpADpL7jAY" >
+                           <source src="https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.mp4"/>
+                           <source src="https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.webm"/>
+                           <source src="https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.ogv"/>
+                       </videoalpha>'''),
+                  scope=Scope.content)
     position = Integer(help="Current position in the video", scope=Scope.user_state, default=0)
-    display_name = String(help="Display name for this module", scope=Scope.settings)
+    display_name = String(
+        display_name="Display Name", help="Display name for this module",
+        default="Video Alpha",
+        scope=Scope.settings
+    )
 
 
 class VideoAlphaModule(VideoAlphaFields, XModule):
diff --git a/common/lib/xmodule/xmodule/word_cloud_module.py b/common/lib/xmodule/xmodule/word_cloud_module.py
index a7f3f92795..004e6ed320 100644
--- a/common/lib/xmodule/xmodule/word_cloud_module.py
+++ b/common/lib/xmodule/xmodule/word_cloud_module.py
@@ -14,7 +14,7 @@ from xmodule.raw_module import RawDescriptor
 from xmodule.editing_module import MetadataOnlyEditingDescriptor
 from xmodule.x_module import XModule
 
-from xblock.core import Scope, Dict, Boolean, List, Integer
+from xblock.core import Scope, Dict, Boolean, List, Integer, String
 
 log = logging.getLogger(__name__)
 
@@ -31,6 +31,12 @@ def pretty_bool(value):
 
 class WordCloudFields(object):
     """XFields for word cloud."""
+    display_name = String(
+        display_name="Display Name",
+        help="Display name for this module",
+        scope=Scope.settings,
+        default="Word cloud"
+    )
     num_inputs = Integer(
         display_name="Inputs",
         help="Number of text boxes available for students to input words/sentences.",
@@ -234,7 +240,7 @@ class WordCloudModule(WordCloudFields, XModule):
         return self.content
 
 
-class WordCloudDescriptor(MetadataOnlyEditingDescriptor, RawDescriptor, WordCloudFields):
+class WordCloudDescriptor(WordCloudFields, MetadataOnlyEditingDescriptor, RawDescriptor):
     """Descriptor for WordCloud Xmodule."""
     module_class = WordCloudModule
     template_dir_name = 'word_cloud'
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 0f5bbf4f2e..aee8e26171 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -7,8 +7,8 @@ from lxml import etree
 from collections import namedtuple
 from pkg_resources import resource_listdir, resource_string, resource_isdir
 
-from xmodule.modulestore import Location
-from xmodule.modulestore.exceptions import ItemNotFoundError
+from xmodule.modulestore import inheritance, Location
+from xmodule.modulestore.exceptions import ItemNotFoundError, InsufficientSpecificationError
 
 from xblock.core import XBlock, Scope, String, Integer, Float, ModelType
 
@@ -101,6 +101,8 @@ class XModuleFields(object):
         display_name="Display Name",
         help="This name appears in the horizontal navigation at the top of the page.",
         scope=Scope.settings,
+        # it'd be nice to have a useful default but it screws up other things; so,
+        # use display_name_with_default for those
         default=None
     )
 
@@ -113,6 +115,14 @@ class XModuleFields(object):
         scope=Scope.content,
         default=Location(None),
     )
+    # Please note that in order to be compatible with XBlocks more generally,
+    # the LMS and CMS shouldn't be using this field. It's only for internal
+    # consumption by the XModules themselves
+    category = String(
+        display_name="xmodule category",
+        help="This is the category id for the XModule. It's for internal use only",
+        scope=Scope.content,
+    )
 
 
 class XModule(XModuleFields, HTMLSnippet, XBlock):
@@ -148,8 +158,16 @@ class XModule(XModuleFields, HTMLSnippet, XBlock):
         self._model_data = model_data
         self.system = runtime
         self.descriptor = descriptor
-        self.url_name = self.location.name
-        self.category = self.location.category
+        # LMS tests don't require descriptor but really it's required
+        if descriptor:
+            self.url_name = descriptor.url_name
+            # don't need to set category as it will automatically get from descriptor
+        elif isinstance(self.location, Location):
+            self.url_name = self.location.name
+            if not hasattr(self, 'category'):
+                self.category = self.location.category
+        else:
+            raise InsufficientSpecificationError()
         self._loaded_children = None
 
     @property
@@ -290,36 +308,67 @@ Template = namedtuple("Template", "metadata data children")
 
 
 class ResourceTemplates(object):
+    """
+    Gets the templates associated w/ a containing cls. The cls must have a 'template_dir_name' attribute.
+    It finds the templates as directly in this directory under 'templates'.
+    """
     @classmethod
     def templates(cls):
         """
-        Returns a list of Template objects that describe possible templates that can be used
-        to create a module of this type.
-        If no templates are provided, there will be no way to create a module of
-        this type
+        Returns a list of dictionary field: value objects that describe possible templates that can be used
+        to seed a module of this type.
 
         Expects a class attribute template_dir_name that defines the directory
         inside the 'templates' resource directory to pull templates from
         """
         templates = []
-        dirname = os.path.join('templates', cls.template_dir_name)
-        if not resource_isdir(__name__, dirname):
-            log.warning("No resource directory {dir} found when loading {cls_name} templates".format(
-                dir=dirname,
-                cls_name=cls.__name__,
-            ))
-            return []
-
-        for template_file in resource_listdir(__name__, dirname):
-            if not template_file.endswith('.yaml'):
-                log.warning("Skipping unknown template file %s" % template_file)
-                continue
-            template_content = resource_string(__name__, os.path.join(dirname, template_file))
-            template = yaml.safe_load(template_content)
-            templates.append(Template(**template))
+        dirname = cls.get_template_dir()
+        if dirname is not None:
+            for template_file in resource_listdir(__name__, dirname):
+                if not template_file.endswith('.yaml'):
+                    log.warning("Skipping unknown template file %s", template_file)
+                    continue
+                template_content = resource_string(__name__, os.path.join(dirname, template_file))
+                template = yaml.safe_load(template_content)
+                template['template_id'] = template_file
+                templates.append(template)
 
         return templates
 
+    @classmethod
+    def get_template_dir(cls):
+        if getattr(cls, 'template_dir_name', None):
+            dirname = os.path.join('templates', getattr(cls, 'template_dir_name'))
+            if not resource_isdir(__name__, dirname):
+                log.warning("No resource directory {dir} found when loading {cls_name} templates".format(
+                    dir=dirname,
+                    cls_name=cls.__name__,
+                ))
+                return None
+            else:
+                return dirname
+        else:
+            return None
+
+    @classmethod
+    def get_template(cls, template_id):
+        """
+        Get a single template by the given id (which is the file name identifying it w/in the class's
+        template_dir_name)
+
+        """
+        dirname = cls.get_template_dir()
+        if dirname is not None:
+            try:
+                template_content = resource_string(__name__, os.path.join(dirname, template_id))
+            except IOError:
+                return None
+            template = yaml.safe_load(template_content)
+            template['template_id'] = template_id
+            return template
+        else:
+            return None
+
 
 class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
     """
@@ -346,9 +395,6 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
     # be equal
     equality_attributes = ('_model_data', 'location')
 
-    # Name of resource directory to load templates from
-    template_dir_name = "default"
-
     # Class level variable
 
     # True if this descriptor always requires recalculation of grades, for
@@ -386,8 +432,12 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
         """
         super(XModuleDescriptor, self).__init__(*args, **kwargs)
         self.system = self.runtime
-        self.url_name = self.location.name
-        self.category = self.location.category
+        if isinstance(self.location, Location):
+            self.url_name = self.location.name
+            if not hasattr(self, 'category'):
+                self.category = self.location.category
+        else:
+            raise InsufficientSpecificationError()
         self._child_instances = None
 
     @property
@@ -419,11 +469,14 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
         if self._child_instances is None:
             self._child_instances = []
             for child_loc in self.children:
-                try:
-                    child = self.system.load_item(child_loc)
-                except ItemNotFoundError:
-                    log.exception('Unable to load item {loc}, skipping'.format(loc=child_loc))
-                    continue
+                if isinstance(child_loc, XModuleDescriptor):
+                    child = child_loc
+                else:
+                    try:
+                        child = self.system.load_item(child_loc)
+                    except ItemNotFoundError:
+                        log.exception('Unable to load item {loc}, skipping'.format(loc=child_loc))
+                        continue
                 self._child_instances.append(child)
 
         return self._child_instances
@@ -591,6 +644,13 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
         """
         return [('{}', '{}')]
 
+    @property
+    def xblock_kvs(self):
+        """
+        Use w/ caution. Really intended for use by the persistence layer.
+        """
+        return self._model_data._kvs
+
     # =============================== BUILTIN METHODS ==========================
     def __eq__(self, other):
         eq = (self.__class__ == other.__class__ and
diff --git a/lms/xmodule_namespace.py b/lms/xmodule_namespace.py
index aaef0b76db..a78e27e5af 100644
--- a/lms/xmodule_namespace.py
+++ b/lms/xmodule_namespace.py
@@ -3,6 +3,8 @@ Namespace that defines fields common to all blocks used in the LMS
 """
 from xblock.core import Namespace, Boolean, Scope, String, Float
 from xmodule.fields import Date, Timedelta
+from datetime import datetime
+from pytz import UTC
 
 
 class LmsNamespace(Namespace):
@@ -25,7 +27,11 @@ class LmsNamespace(Namespace):
         scope=Scope.settings,
     )
 
-    start = Date(help="Start time when this module is visible", scope=Scope.settings)
+    start = Date(
+        help="Start time when this module is visible",
+        default=datetime.fromtimestamp(0, UTC),
+        scope=Scope.settings
+    )
     due = Date(help="Date that this problem is due by", scope=Scope.settings)
     source_file = String(help="source file name (eg for latex)", scope=Scope.settings)
     giturl = String(help="url root for course data git repository", scope=Scope.settings)

From 3722685e1a185ff4a0a085bb380ed793cf6d1e59 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 24 Jun 2013 15:44:49 -0400
Subject: [PATCH 16/22] No longer persist XModule templates

Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
---
 CHANGELOG.rst                                 |   7 +
 README.md                                     |   1 -
 .../contentstore/course_info_model.py         |   4 +-
 .../contentstore/features/common.py           |   2 +-
 .../component_settings_editor_helpers.py      |  16 +-
 .../features/discussion-editor.py             |   4 +-
 .../contentstore/features/html-editor.py      |   2 +-
 .../contentstore/features/problem-editor.py   |   2 +-
 .../features/studio-overview-togglesection.py |   8 +-
 cms/djangoapps/contentstore/features/video.py |   2 +-
 .../management/commands/update_templates.py   |  10 -
 .../contentstore/module_info_model.py         |  24 +--
 .../contentstore/tests/test_contentstore.py   | 108 ++++------
 .../tests/test_course_settings.py             |   1 +
 .../contentstore/tests/test_i18n.py           |   1 -
 .../contentstore/tests/test_item.py           | 196 +++++++++++++++++-
 cms/djangoapps/contentstore/tests/utils.py    |   1 -
 cms/djangoapps/contentstore/utils.py          |   8 +-
 .../contentstore/views/checklist.py           |   6 +-
 .../contentstore/views/component.py           |  65 ++++--
 cms/djangoapps/contentstore/views/course.py   |  34 ++-
 cms/djangoapps/contentstore/views/item.py     |  75 ++++---
 cms/djangoapps/contentstore/views/user.py     |   2 +-
 .../models/settings/course_grading.py         |  10 +-
 .../coffee/src/views/module_edit.coffee       |  17 +-
 cms/static/coffee/src/views/tabs.coffee       |   4 +-
 cms/static/coffee/src/views/unit.coffee       |   4 +-
 cms/static/js/base.js                         |  22 +-
 cms/templates/index.html                      |   4 +-
 cms/templates/overview.html                   |  12 +-
 cms/templates/unit.html                       |  99 +++++----
 cms/templates/widgets/units.html              |   2 +-
 cms/urls.py                                   |   2 +-
 common/djangoapps/terrain/course_helpers.py   |   2 -
 common/djangoapps/tests.py                    |   6 +-
 common/lib/xmodule/xmodule/abtest_module.py   |   2 -
 .../lib/xmodule/xmodule/annotatable_module.py |   1 -
 .../xmodule/combined_open_ended_module.py     |   1 -
 common/lib/xmodule/xmodule/course_module.py   |   2 -
 common/lib/xmodule/xmodule/error_module.py    |   7 +-
 common/lib/xmodule/xmodule/foldit_module.py   |   1 -
 common/lib/xmodule/xmodule/gst_module.py      |   1 -
 common/lib/xmodule/xmodule/html_module.py     |   4 +-
 .../spec/combinedopenended/edit_spec.coffee   |   4 +-
 .../xmodule/js/spec/problem/edit_spec.coffee  |   4 +-
 .../js/src/combinedopenended/edit.coffee      |   3 +-
 .../xmodule/js/src/problem/edit.coffee        |   5 +-
 .../xmodule/xmodule/modulestore/__init__.py   |   9 +-
 .../xmodule/xmodule/modulestore/mongo/base.py | 173 ++++++++++++----
 .../xmodule/modulestore/mongo/draft.py        |  58 ++++--
 .../xmodule/modulestore/tests/django_utils.py |  20 --
 .../xmodule/modulestore/tests/factories.py    | 120 +++--------
 .../xmodule/modulestore/tests/test_mongo.py   |   4 +-
 common/lib/xmodule/xmodule/modulestore/xml.py |   5 +-
 .../combined_open_ended_modulev1.py           |   1 -
 .../open_ended_module.py                      |   1 -
 .../self_assessment_module.py                 |   1 -
 .../xmodule/xmodule/peer_grading_module.py    |   1 -
 common/lib/xmodule/xmodule/poll_module.py     |   1 -
 common/lib/xmodule/xmodule/templates.py       |  96 +--------
 .../xmodule/templates/about/empty.yaml        |   1 -
 .../templates/annotatable/default.yaml        |   1 -
 .../templates/combinedopenended/default.yaml  |   1 -
 .../xmodule/templates/course/empty.yaml       |   1 -
 .../xmodule/templates/courseinfo/empty.yaml   |   1 -
 .../xmodule/templates/default/empty.yaml      |   1 -
 .../xmodule/templates/discussion/default.yaml |   1 -
 .../xmodule/templates/html/announcement.yaml  |   1 -
 .../xmodule/xmodule/templates/html/empty.yaml |   1 -
 .../xmodule/templates/html/everything.yaml    |  33 ---
 .../xmodule/templates/html/latex_html.yaml    |   1 -
 .../templates/peer_grading/default.yaml       |   1 -
 .../templates/problem/circuitschematic.yaml   |   2 +-
 .../templates/problem/customgrader.yaml       |  77 ++++---
 .../xmodule/templates/problem/empty.yaml      |   1 -
 .../templates/problem/emptyadvanced.yaml      |  10 -
 .../templates/problem/forumularesponse.yaml   |   3 +-
 .../templates/problem/imageresponse.yaml      |   4 +-
 .../templates/problem/latex_problem.yaml      |   2 +-
 .../templates/problem/multiplechoice.yaml     |  13 +-
 .../templates/problem/numericalresponse.yaml  |  22 +-
 .../templates/problem/optionresponse.yaml     |  11 +-
 .../templates/problem/problem_with_hint.yaml  |   3 +-
 .../templates/problem/string_response.yaml    |  11 +-
 .../templates/sequence/with_video.yaml        |   7 -
 .../xmodule/templates/statictab/empty.yaml    |   1 -
 .../xmodule/templates/video/default.yaml      |   1 -
 .../xmodule/templates/videoalpha/default.yaml |   1 -
 .../xmodule/templates/word_cloud/default.yaml |   1 -
 .../lib/xmodule/xmodule/tests/test_logic.py   |   3 +-
 .../xmodule/xmodule/tests/test_xml_module.py  |   1 +
 common/lib/xmodule/xmodule/video_module.py    |   1 -
 .../lib/xmodule/xmodule/videoalpha_module.py  |   1 -
 common/lib/xmodule/xmodule/xml_module.py      |   1 +
 lms/djangoapps/courseware/features/common.py  |   5 +-
 .../courseware/features/navigation.py         |  11 +-
 .../courseware/features/problems.py           |   2 +-
 .../courseware/features/problems_setup.py     |   6 +-
 lms/djangoapps/courseware/features/video.py   |   7 +-
 lms/djangoapps/courseware/tests/__init__.py   |  12 +-
 .../tests/test_submitting_problems.py         |   6 +-
 .../courseware/tests/test_video_mongo.py      |   2 +-
 .../courseware/tests/test_videoalpha_mongo.py |   2 +-
 lms/djangoapps/courseware/tests/tests.py      |   9 +-
 .../instructor/tests/test_gradebook.py        |  10 +-
 .../instructor_task/tests/test_base.py        |   4 +-
 .../instructor_task/tests/test_integration.py |   4 +-
 lms/djangoapps/open_ended_grading/tests.py    |   2 +-
 rakelib/django.rake                           |   5 -
 109 files changed, 807 insertions(+), 789 deletions(-)
 delete mode 100644 cms/djangoapps/contentstore/management/commands/update_templates.py
 delete mode 100644 common/lib/xmodule/xmodule/templates/about/empty.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/annotatable/default.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/course/empty.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/courseinfo/empty.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/default/empty.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/discussion/default.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/html/empty.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/html/everything.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/peer_grading/default.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/problem/empty.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/sequence/with_video.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/statictab/empty.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/video/default.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/videoalpha/default.yaml
 delete mode 100644 common/lib/xmodule/xmodule/templates/word_cloud/default.yaml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4d117a9c73..04c8a5baae 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -43,6 +43,13 @@ history of background tasks for a given problem and student.
 Blades: Small UX fix on capa multiple-choice problems.  Make labels only
 as wide as the text to reduce accidental choice selections.
 
+Studio: 
+- use xblock field defaults to initialize all new instances' fields and
+only use templates as override samples.
+- create new instances via in memory create_xmodule and related methods rather
+than cloning a db record.
+- have an explicit method for making a draft copy as distinct from making a new module.
+
 Studio: Remove XML from the video component editor. All settings are
 moved to be edited as metadata.
 
diff --git a/README.md b/README.md
index e533459c8b..2208fe1cad 100644
--- a/README.md
+++ b/README.md
@@ -239,7 +239,6 @@ CMS templates. Fortunately, `rake` will do all of this for you! Just run:
 
     $ rake django-admin[syncdb]
     $ rake django-admin[migrate]
-    $ rake cms:update_templates
 
 If you are running these commands using the [`zsh`](http://www.zsh.org/) shell,
 zsh will assume that you are doing
diff --git a/cms/djangoapps/contentstore/course_info_model.py b/cms/djangoapps/contentstore/course_info_model.py
index ada3873992..7e1e6470ff 100644
--- a/cms/djangoapps/contentstore/course_info_model.py
+++ b/cms/djangoapps/contentstore/course_info_model.py
@@ -20,8 +20,8 @@ def get_course_updates(location):
     try:
         course_updates = modulestore('direct').get_item(location)
     except ItemNotFoundError:
-        template = Location(['i4x', 'edx', "templates", 'course_info', "Empty"])
-        course_updates = modulestore('direct').clone_item(template, Location(location))
+        modulestore('direct').create_and_save_xmodule(location)
+        course_updates = modulestore('direct').get_item(location)
 
     # current db rep: {"_id" : locationjson, "definition" : { "data" : "<ol>[<li><h2>date</h2>content</li>]</ol>"} "metadata" : ignored}
     location_base = course_updates.location.url()
diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py
index cb24af47e0..756adad7c4 100644
--- a/cms/djangoapps/contentstore/features/common.py
+++ b/cms/djangoapps/contentstore/features/common.py
@@ -208,7 +208,7 @@ def set_date_and_time(date_css, desired_date, time_css, desired_time):
 def i_created_a_video_component(step):
     world.create_component_instance(
         step, '.large-video-icon',
-        'i4x://edx/templates/video/default',
+        'video',
         '.xmodule_VideoModule'
     )
 
diff --git a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
index 43164f62be..2f1788c6a4 100644
--- a/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
+++ b/cms/djangoapps/contentstore/features/component_settings_editor_helpers.py
@@ -7,9 +7,9 @@ from terrain.steps import reload_the_page
 
 
 @world.absorb
-def create_component_instance(step, component_button_css, instance_id, expected_css):
+def create_component_instance(step, component_button_css, category, expected_css, boilerplate=None):
     click_new_component_button(step, component_button_css)
-    click_component_from_menu(instance_id, expected_css)
+    click_component_from_menu(category, boilerplate, expected_css)
 
 
 @world.absorb
@@ -19,7 +19,7 @@ def click_new_component_button(step, component_button_css):
 
 
 @world.absorb
-def click_component_from_menu(instance_id, expected_css):
+def click_component_from_menu(category, boilerplate, expected_css):
     """
     Creates a component from `instance_id`. For components with more
     than one template, clicks on `elem_css` to create the new
@@ -27,11 +27,13 @@ def click_component_from_menu(instance_id, expected_css):
     as the user clicks the appropriate button, so we assert that the
     expected component is present.
     """
-    elem_css = "a[data-location='%s']" % instance_id
+    if boilerplate:
+        elem_css = "a[data-category='{}'][data-boilerplate='{}']".format(category, boilerplate)
+    else:
+        elem_css = "a[data-category='{}']:not([data-boilerplate])".format(category)
     elements = world.css_find(elem_css)
-    assert(len(elements) == 1)
-    if elements[0]['id'] == instance_id:  # If this is a component with multiple templates
-        world.css_click(elem_css)
+    assert_equal(len(elements), 1)
+    world.css_click(elem_css)
     assert_equal(1, len(world.css_find(expected_css)))
 
 
diff --git a/cms/djangoapps/contentstore/features/discussion-editor.py b/cms/djangoapps/contentstore/features/discussion-editor.py
index a4a4b71668..8e4becb62e 100644
--- a/cms/djangoapps/contentstore/features/discussion-editor.py
+++ b/cms/djangoapps/contentstore/features/discussion-editor.py
@@ -8,7 +8,7 @@ from lettuce import world, step
 def i_created_discussion_tag(step):
     world.create_component_instance(
         step, '.large-discussion-icon',
-        'i4x://edx/templates/discussion/Discussion_Tag',
+        'discussion',
         '.xmodule_DiscussionModule'
     )
 
@@ -26,5 +26,5 @@ def i_see_only_the_settings_and_values(step):
 @step('creating a discussion takes a single click')
 def discussion_takes_a_single_click(step):
     assert(not world.is_css_present('.xmodule_DiscussionModule'))
-    world.css_click("a[data-location='i4x://edx/templates/discussion/Discussion_Tag']")
+    world.css_click("a[data-category='discussion']")
     assert(world.is_css_present('.xmodule_DiscussionModule'))
diff --git a/cms/djangoapps/contentstore/features/html-editor.py b/cms/djangoapps/contentstore/features/html-editor.py
index 53462ba094..b03388c89a 100644
--- a/cms/djangoapps/contentstore/features/html-editor.py
+++ b/cms/djangoapps/contentstore/features/html-editor.py
@@ -7,7 +7,7 @@ from lettuce import world, step
 @step('I have created a Blank HTML Page$')
 def i_created_blank_html_page(step):
     world.create_component_instance(
-        step, '.large-html-icon', 'i4x://edx/templates/html/Blank_HTML_Page',
+        step, '.large-html-icon', 'html',
         '.xmodule_HtmlModule'
     )
 
diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py
index 15f5da95e9..99b693225d 100644
--- a/cms/djangoapps/contentstore/features/problem-editor.py
+++ b/cms/djangoapps/contentstore/features/problem-editor.py
@@ -158,7 +158,7 @@ def create_latex_problem(step):
     world.click_new_component_button(step, '.large-problem-icon')
     # Go to advanced tab.
     world.css_click('#ui-id-2')
-    world.click_component_from_menu("i4x://edx/templates/problem/Problem_Written_in_LaTeX", '.xmodule_CapaModule')
+    world.click_component_from_menu("problem", "latex_problem.yaml", '.xmodule_CapaModule')
 
 
 @step('I edit and compile the High Level Source')
diff --git a/cms/djangoapps/contentstore/features/studio-overview-togglesection.py b/cms/djangoapps/contentstore/features/studio-overview-togglesection.py
index 9ab17fbdac..41e39513ea 100644
--- a/cms/djangoapps/contentstore/features/studio-overview-togglesection.py
+++ b/cms/djangoapps/contentstore/features/studio-overview-togglesection.py
@@ -22,7 +22,7 @@ def have_a_course_with_1_section(step):
     section = world.ItemFactory.create(parent_location=course.location)
     subsection1 = world.ItemFactory.create(
         parent_location=section.location,
-        template='i4x://edx/templates/sequential/Empty',
+        category='sequential',
         display_name='Subsection One',)
 
 
@@ -33,18 +33,18 @@ def have_a_course_with_two_sections(step):
     section = world.ItemFactory.create(parent_location=course.location)
     subsection1 = world.ItemFactory.create(
         parent_location=section.location,
-        template='i4x://edx/templates/sequential/Empty',
+        category='sequential',
         display_name='Subsection One',)
     section2 = world.ItemFactory.create(
         parent_location=course.location,
         display_name='Section Two',)
     subsection2 = world.ItemFactory.create(
         parent_location=section2.location,
-        template='i4x://edx/templates/sequential/Empty',
+        category='sequential',
         display_name='Subsection Alpha',)
     subsection3 = world.ItemFactory.create(
         parent_location=section2.location,
-        template='i4x://edx/templates/sequential/Empty',
+        category='sequential',
         display_name='Subsection Beta',)
 
 
diff --git a/cms/djangoapps/contentstore/features/video.py b/cms/djangoapps/contentstore/features/video.py
index cb59193f17..a6a362befc 100644
--- a/cms/djangoapps/contentstore/features/video.py
+++ b/cms/djangoapps/contentstore/features/video.py
@@ -14,7 +14,7 @@ def does_not_autoplay(_step):
 @step('creating a video takes a single click')
 def video_takes_a_single_click(_step):
     assert(not world.is_css_present('.xmodule_VideoModule'))
-    world.css_click("a[data-location='i4x://edx/templates/video/default']")
+    world.css_click("a[data-category='video']")
     assert(world.is_css_present('.xmodule_VideoModule'))
 
 
diff --git a/cms/djangoapps/contentstore/management/commands/update_templates.py b/cms/djangoapps/contentstore/management/commands/update_templates.py
deleted file mode 100644
index 36348314b9..0000000000
--- a/cms/djangoapps/contentstore/management/commands/update_templates.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from xmodule.templates import update_templates
-from xmodule.modulestore.django import modulestore
-from django.core.management.base import BaseCommand
-
-
-class Command(BaseCommand):
-    help = 'Imports and updates the Studio component templates from the code pack and put in the DB'
-
-    def handle(self, *args, **options):
-        update_templates(modulestore('direct'))
diff --git a/cms/djangoapps/contentstore/module_info_model.py b/cms/djangoapps/contentstore/module_info_model.py
index 726d4bb0ce..bce4b0326c 100644
--- a/cms/djangoapps/contentstore/module_info_model.py
+++ b/cms/djangoapps/contentstore/module_info_model.py
@@ -3,13 +3,13 @@ from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore import Location
 
 
-def get_module_info(store, location, parent_location=None, rewrite_static_links=False):
+def get_module_info(store, location, rewrite_static_links=False):
     try:
         module = store.get_item(location)
     except ItemNotFoundError:
         # create a new one
-        template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty'])
-        module = store.clone_item(template_location, location)
+        store.create_and_save_xmodule(location)
+        module = store.get_item(location)
 
     data = module.data
     if rewrite_static_links:
@@ -29,7 +29,8 @@ def get_module_info(store, location, parent_location=None, rewrite_static_links=
         'id': module.location.url(),
         'data': data,
         # TODO (cpennington): This really shouldn't have to do this much reaching in to get the metadata
-        'metadata': module._model_data._kvs._metadata
+        # what's the intent here? all metadata incl inherited & namespaced?
+        'metadata': module.xblock_kvs._metadata
     }
 
 
@@ -37,14 +38,11 @@ def set_module_info(store, location, post_data):
     module = None
     try:
         module = store.get_item(location)
-    except:
-        pass
-
-    if module is None:
-        # new module at this location
-        # presume that we have an 'Empty' template
-        template_location = Location(['i4x', 'edx', 'templates', location.category, 'Empty'])
-        module = store.clone_item(template_location, location)
+    except ItemNotFoundError:
+        # new module at this location: almost always used for the course about pages; thus, no parent. (there
+        # are quite a handful of about page types available for a course and only the overview is pre-created)
+        store.create_and_save_xmodule(location)
+        module = store.get_item(location)
 
     if post_data.get('data') is not None:
         data = post_data['data']
@@ -79,4 +77,4 @@ def set_module_info(store, location, post_data):
 
         # commit to datastore
         # TODO (cpennington): This really shouldn't have to do this much reaching in to get the metadata
-        store.update_metadata(location, module._model_data._kvs._metadata)
+        store.update_metadata(location, module.xblock_kvs._metadata)
diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index 6099b60eb1..fa7c45cb1d 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -24,12 +24,11 @@ from auth.authz import add_user_to_creator_group
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 
-from xmodule.modulestore import Location
+from xmodule.modulestore import Location, mongo
 from xmodule.modulestore.store_utilities import clone_course
 from xmodule.modulestore.store_utilities import delete_course
 from xmodule.modulestore.django import modulestore
 from xmodule.contentstore.django import contentstore, _CONTENTSTORE
-from xmodule.templates import update_templates
 from xmodule.modulestore.xml_exporter import export_to_xml
 from xmodule.modulestore.xml_importer import import_from_xml, perform_xlint
 from xmodule.modulestore.inheritance import own_metadata
@@ -183,7 +182,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
 
         html_module = draft_store.get_item(['i4x', 'edX', 'simple', 'html', 'test_html', None])
 
-        draft_store.clone_item(html_module.location, html_module.location)
+        draft_store.convert_to_draft(html_module.location)
 
         # now query get_items() to get this location with revision=None, this should just
         # return back a single item (not 2)
@@ -215,7 +214,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         self.assertEqual(html_module.lms.graceperiod, course.lms.graceperiod)
         self.assertNotIn('graceperiod', own_metadata(html_module))
 
-        draft_store.clone_item(html_module.location, html_module.location)
+        draft_store.convert_to_draft(html_module.location)
 
         # refetch to check metadata
         html_module = draft_store.get_item(['i4x', 'edX', 'simple', 'html', 'test_html', None])
@@ -233,7 +232,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         self.assertNotIn('graceperiod', own_metadata(html_module))
 
         # put back in draft and change metadata and see if it's now marked as 'own_metadata'
-        draft_store.clone_item(html_module.location, html_module.location)
+        draft_store.convert_to_draft(html_module.location)
         html_module = draft_store.get_item(['i4x', 'edX', 'simple', 'html', 'test_html', None])
 
         new_graceperiod = timedelta(hours=1)
@@ -255,7 +254,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         draft_store.publish(html_module.location, 0)
 
         # and re-read and verify 'own-metadata'
-        draft_store.clone_item(html_module.location, html_module.location)
+        draft_store.convert_to_draft(html_module.location)
         html_module = draft_store.get_item(['i4x', 'edX', 'simple', 'html', 'test_html', None])
 
         self.assertIn('graceperiod', own_metadata(html_module))
@@ -278,7 +277,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         )
 
         # put into draft
-        modulestore('draft').clone_item(problem.location, problem.location)
+        modulestore('draft').convert_to_draft(problem.location)
 
         # make sure we can query that item and verify that it is a draft
         draft_problem = modulestore('draft').get_item(
@@ -574,7 +573,6 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
     def test_clone_course(self):
 
         course_data = {
-            'template': 'i4x://edx/templates/course/Empty',
             'org': 'MITx',
             'number': '999',
             'display_name': 'Robot Super Course',
@@ -614,10 +612,10 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
 
         location = Location('i4x://MITx/999/chapter/neuvo')
-        self.assertRaises(InvalidVersionError, draft_store.clone_item, 'i4x://edx/templates/chapter/Empty',
-                          location)
-        direct_store.clone_item('i4x://edx/templates/chapter/Empty', location)
-        self.assertRaises(InvalidVersionError, draft_store.clone_item, location, location)
+        # Ensure draft mongo store does not allow us to create chapters either directly or via convert to draft
+        self.assertRaises(InvalidVersionError, draft_store.create_and_save_xmodule, location)
+        direct_store.create_and_save_xmodule(location)
+        self.assertRaises(InvalidVersionError, draft_store.convert_to_draft, location)
 
         self.assertRaises(InvalidVersionError, draft_store.update_item, location, 'chapter data')
 
@@ -687,26 +685,35 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         import_from_xml(module_store, 'common/test/data/', ['toy'])
         location = CourseDescriptor.id_to_location('edX/toy/2012_Fall')
 
-        # get a vertical (and components in it) to put into 'draft'
-        vertical = module_store.get_item(Location(['i4x', 'edX', 'toy',
-                                         'vertical', 'vertical_test', None]), depth=1)
-
-        draft_store.clone_item(vertical.location, vertical.location)
-
+        # get a vertical (and components in it) to copy into an orphan sub dag
+        vertical = module_store.get_item(
+            Location(['i4x', 'edX', 'toy', 'vertical', 'vertical_test', None]),
+            depth=1
+        )
         # We had a bug where orphaned draft nodes caused export to fail. This is here to cover that case.
-        draft_store.clone_item(vertical.location, Location(['i4x', 'edX', 'toy',
-                                                            'vertical', 'no_references', 'draft']))
+        vertical.location = mongo.draft.as_draft(vertical.location.replace(name='no_references'))
+        draft_store.save_xmodule(vertical)
+        orphan_vertical = draft_store.get_item(vertical.location)
+        self.assertEqual(orphan_vertical.location.name, 'no_references')
 
+        # get the original vertical (and components in it) to put into 'draft'
+        vertical = module_store.get_item(
+            Location(['i4x', 'edX', 'toy', 'vertical', 'vertical_test', None]),
+            depth=1)
+        self.assertEqual(len(orphan_vertical.children), len(vertical.children))
+        draft_store.convert_to_draft(vertical.location)
         for child in vertical.get_children():
-            draft_store.clone_item(child.location, child.location)
+            draft_store.convert_to_draft(child.location)
 
         root_dir = path(mkdtemp_clean())
 
-        # now create a private vertical
-        private_vertical = draft_store.clone_item(vertical.location,
-                                                  Location(['i4x', 'edX', 'toy', 'vertical', 'a_private_vertical', None]))
+        # now create a new/different private (draft only) vertical
+        vertical.location = mongo.draft.as_draft(Location(['i4x', 'edX', 'toy', 'vertical', 'a_private_vertical', None]))
+        draft_store.save_xmodule(vertical)
+        private_vertical = draft_store.get_item(vertical.location)
+        vertical = None  # blank out b/c i destructively manipulated its location 2 lines above
 
-        # add private to list of children
+        # add the new private to list of children
         sequential = module_store.get_item(Location(['i4x', 'edX', 'toy',
                                            'sequential', 'vertical_sequential', None]))
         private_location_no_draft = private_vertical.location.replace(revision=None)
@@ -885,7 +892,6 @@ class ContentStoreTest(ModuleStoreTestCase):
         self.client.login(username=uname, password=password)
 
         self.course_data = {
-            'template': 'i4x://edx/templates/course/Empty',
             'org': 'MITx',
             'number': '999',
             'display_name': 'Robot Super Course',
@@ -1029,17 +1035,17 @@ class ContentStoreTest(ModuleStoreTestCase):
             html=True
         )
 
-    def test_clone_item(self):
+    def test_create_item(self):
         """Test cloning an item. E.g. creating a new section"""
         CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
 
         section_data = {
             'parent_location': 'i4x://MITx/999/course/Robot_Super_Course',
-            'template': 'i4x://edx/templates/chapter/Empty',
+            'category': 'chapter',
             'display_name': 'Section One',
         }
 
-        resp = self.client.post(reverse('clone_item'), section_data)
+        resp = self.client.post(reverse('create_item'), section_data)
 
         self.assertEqual(resp.status_code, 200)
         data = parse_json(resp)
@@ -1054,14 +1060,14 @@ class ContentStoreTest(ModuleStoreTestCase):
 
         problem_data = {
             'parent_location': 'i4x://MITx/999/course/Robot_Super_Course',
-            'template': 'i4x://edx/templates/problem/Blank_Common_Problem'
+            'category': 'problem'
         }
 
-        resp = self.client.post(reverse('clone_item'), problem_data)
+        resp = self.client.post(reverse('create_item'), problem_data)
 
         self.assertEqual(resp.status_code, 200)
         payload = parse_json(resp)
-        problem_loc = payload['id']
+        problem_loc = Location(payload['id'])
         problem = get_modulestore(problem_loc).get_item(problem_loc)
         # should be a CapaDescriptor
         self.assertIsInstance(problem, CapaDescriptor, "New problem is not a CapaDescriptor")
@@ -1194,10 +1200,9 @@ class ContentStoreTest(ModuleStoreTestCase):
         CourseFactory.create(org='edX', course='999', display_name='Robot Super Course')
 
         new_component_location = Location('i4x', 'edX', '999', 'discussion', 'new_component')
-        source_template_location = Location('i4x', 'edx', 'templates', 'discussion', 'Discussion_Tag')
 
         # crate a new module and add it as a child to a vertical
-        module_store.clone_item(source_template_location, new_component_location)
+        module_store.create_and_save_xmodule(new_component_location)
 
         new_discussion_item = module_store.get_item(new_component_location)
 
@@ -1218,10 +1223,9 @@ class ContentStoreTest(ModuleStoreTestCase):
             module_store.modulestore_update_signal.connect(_signal_hander)
 
             new_component_location = Location('i4x', 'edX', '999', 'html', 'new_component')
-            source_template_location = Location('i4x', 'edx', 'templates', 'html', 'Blank_HTML_Page')
 
             # crate a new module
-            module_store.clone_item(source_template_location, new_component_location)
+            module_store.create_and_save_xmodule(new_component_location)
 
         finally:
             module_store.modulestore_update_signal = None
@@ -1239,14 +1243,14 @@ class ContentStoreTest(ModuleStoreTestCase):
         # let's assert on the metadata_inheritance on an existing vertical
         for vertical in verticals:
             self.assertEqual(course.lms.xqa_key, vertical.lms.xqa_key)
+            self.assertEqual(course.start, vertical.lms.start)
 
         self.assertGreater(len(verticals), 0)
 
         new_component_location = Location('i4x', 'edX', 'toy', 'html', 'new_component')
-        source_template_location = Location('i4x', 'edx', 'templates', 'html', 'Blank_HTML_Page')
 
         # crate a new module and add it as a child to a vertical
-        module_store.clone_item(source_template_location, new_component_location)
+        module_store.create_and_save_xmodule(new_component_location)
         parent = verticals[0]
         module_store.update_children(parent.location, parent.children + [new_component_location.url()])
 
@@ -1256,6 +1260,8 @@ class ContentStoreTest(ModuleStoreTestCase):
 
         # check for grace period definition which should be defined at the course level
         self.assertEqual(parent.lms.graceperiod, new_module.lms.graceperiod)
+        self.assertEqual(parent.lms.start, new_module.lms.start)
+        self.assertEqual(course.start, new_module.lms.start)
 
         self.assertEqual(course.lms.xqa_key, new_module.lms.xqa_key)
 
@@ -1293,29 +1299,3 @@ class ContentStoreTest(ModuleStoreTestCase):
         self.assertEqual(course.textbooks, fetched_course.textbooks)
         # is this test too strict? i.e., it requires the dicts to be ==
         self.assertEqual(course.checklists, fetched_course.checklists)
-
-class TemplateTestCase(ModuleStoreTestCase):
-
-    def test_template_cleanup(self):
-        module_store = modulestore('direct')
-
-        # insert a bogus template in the store
-        bogus_template_location = Location('i4x', 'edx', 'templates', 'html', 'bogus')
-        source_template_location = Location('i4x', 'edx', 'templates', 'html', 'Blank_HTML_Page')
-
-        module_store.clone_item(source_template_location, bogus_template_location)
-
-        verify_create = module_store.get_item(bogus_template_location)
-        self.assertIsNotNone(verify_create)
-
-        # now run cleanup
-        update_templates(modulestore('direct'))
-
-        # now try to find dangling template, it should not be in DB any longer
-        asserted = False
-        try:
-            verify_create = module_store.get_item(bogus_template_location)
-        except ItemNotFoundError:
-            asserted = True
-
-        self.assertTrue(asserted)
diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py
index 6c23e68240..fc04ad0a58 100644
--- a/cms/djangoapps/contentstore/tests/test_course_settings.py
+++ b/cms/djangoapps/contentstore/tests/test_course_settings.py
@@ -19,6 +19,7 @@ from xmodule.modulestore.tests.factories import CourseFactory
 
 from models.settings.course_metadata import CourseMetadata
 from xmodule.modulestore.xml_importer import import_from_xml
+from xmodule.modulestore.django import modulestore
 from xmodule.fields import Date
 
 from .utils import CourseTestCase
diff --git a/cms/djangoapps/contentstore/tests/test_i18n.py b/cms/djangoapps/contentstore/tests/test_i18n.py
index a292b7316e..88df19ec2d 100644
--- a/cms/djangoapps/contentstore/tests/test_i18n.py
+++ b/cms/djangoapps/contentstore/tests/test_i18n.py
@@ -35,7 +35,6 @@ class InternationalizationTest(ModuleStoreTestCase):
         self.user.save()
 
         self.course_data = {
-            'template': 'i4x://edx/templates/course/Empty',
             'org': 'MITx',
             'number': '999',
             'display_name': 'Robot Super Course',
diff --git a/cms/djangoapps/contentstore/tests/test_item.py b/cms/djangoapps/contentstore/tests/test_item.py
index 4e6c951d9b..2b514c0726 100644
--- a/cms/djangoapps/contentstore/tests/test_item.py
+++ b/cms/djangoapps/contentstore/tests/test_item.py
@@ -1,6 +1,9 @@
 from contentstore.tests.test_course_settings import CourseTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 from django.core.urlresolvers import reverse
+from xmodule.capa_module import CapaDescriptor
+import json
+from xmodule.modulestore.django import modulestore
 
 
 class DeleteItem(CourseTestCase):
@@ -11,14 +14,199 @@ class DeleteItem(CourseTestCase):
 
     def testDeleteStaticPage(self):
         # Add static tab
-        data = {
+        data = json.dumps({
             'parent_location': 'i4x://mitX/333/course/Dummy_Course',
-            'template': 'i4x://edx/templates/static_tab/Empty'
-        }
+            'category': 'static_tab'
+        })
 
-        resp = self.client.post(reverse('clone_item'), data)
+        resp = self.client.post(reverse('create_item'), data,
+            content_type="application/json")
         self.assertEqual(resp.status_code, 200)
 
         # Now delete it. There was a bug that the delete was failing (static tabs do not exist in draft modulestore).
         resp = self.client.post(reverse('delete_item'), resp.content, "application/json")
         self.assertEqual(resp.status_code, 200)
+
+
+class TestCreateItem(CourseTestCase):
+    """
+    Test the create_item handler thoroughly
+    """
+    def response_id(self, response):
+        """
+        Get the id from the response payload
+        :param response:
+        """
+        parsed = json.loads(response.content)
+        return parsed['id']
+
+    def test_create_nicely(self):
+        """
+        Try the straightforward use cases
+        """
+        # create a chapter
+        display_name = 'Nicely created'
+        resp = self.client.post(
+            reverse('create_item'),
+            json.dumps({
+                'parent_location': self.course_location.url(),
+                'display_name': display_name,
+                'category': 'chapter'
+            }),
+            content_type="application/json"
+        )
+        self.assertEqual(resp.status_code, 200)
+
+        # get the new item and check its category and display_name
+        chap_location = self.response_id(resp)
+        new_obj = modulestore().get_item(chap_location)
+        self.assertEqual(new_obj.category, 'chapter')
+        self.assertEqual(new_obj.display_name, display_name)
+        self.assertEqual(new_obj.location.org, self.course_location.org)
+        self.assertEqual(new_obj.location.course, self.course_location.course)
+
+        # get the course and ensure it now points to this one
+        course = modulestore().get_item(self.course_location)
+        self.assertIn(chap_location, course.children)
+
+        # use default display name
+        resp = self.client.post(
+            reverse('create_item'),
+            json.dumps({
+                'parent_location': chap_location,
+                'category': 'vertical'
+            }),
+            content_type="application/json"
+        )
+        self.assertEqual(resp.status_code, 200)
+
+        vert_location = self.response_id(resp)
+
+        # create problem w/ boilerplate
+        template_id = 'multiplechoice.yaml'
+        resp = self.client.post(
+            reverse('create_item'),
+            json.dumps({
+                'parent_location': vert_location,
+                'category': 'problem',
+                'boilerplate': template_id
+            }),
+            content_type="application/json"
+        )
+        self.assertEqual(resp.status_code, 200)
+        prob_location = self.response_id(resp)
+        problem = modulestore('draft').get_item(prob_location)
+        # ensure it's draft
+        self.assertTrue(problem.is_draft)
+        # check against the template
+        template = CapaDescriptor.get_template(template_id)
+        self.assertEqual(problem.data, template['data'])
+        self.assertEqual(problem.display_name, template['metadata']['display_name'])
+        self.assertEqual(problem.markdown, template['metadata']['markdown'])
+
+    def test_create_item_negative(self):
+        """
+        Negative tests for create_item
+        """
+        # non-existent boilerplate: creates a default
+        resp = self.client.post(
+            reverse('create_item'),
+            json.dumps(
+                {'parent_location': self.course_location.url(),
+                 'category': 'problem',
+                 'boilerplate': 'nosuchboilerplate.yaml'
+                 }),
+            content_type="application/json"
+        )
+        self.assertEqual(resp.status_code, 200)
+
+class TestEditItem(CourseTestCase):
+    """
+    Test contentstore.views.item.save_item
+    """
+    def response_id(self, response):
+        """
+        Get the id from the response payload
+        :param response:
+        """
+        parsed = json.loads(response.content)
+        return parsed['id']
+
+    def setUp(self):
+        """ Creates the test course structure and a couple problems to 'edit'. """
+        super(TestEditItem, self).setUp()
+        # create a chapter
+        display_name = 'chapter created'
+        resp = self.client.post(
+            reverse('create_item'),
+            json.dumps(
+                {'parent_location': self.course_location.url(),
+                 'display_name': display_name,
+                 'category': 'chapter'
+                 }),
+            content_type="application/json"
+        )
+        chap_location = self.response_id(resp)
+        resp = self.client.post(
+            reverse('create_item'),
+            json.dumps(
+                {'parent_location': chap_location,
+                 'category': 'vertical'
+                }),
+            content_type="application/json"
+        )
+        vert_location = self.response_id(resp)
+        # create problem w/ boilerplate
+        template_id = 'multiplechoice.yaml'
+        resp = self.client.post(
+            reverse('create_item'),
+            json.dumps({'parent_location': vert_location,
+             'category': 'problem',
+             'boilerplate': template_id
+            }),
+            content_type="application/json"
+        )
+        self.problems = [self.response_id(resp)]
+
+    def test_delete_field(self):
+        """
+        Sending null in for a field 'deletes' it
+        """
+        self.client.post(
+            reverse('save_item'),
+            json.dumps({
+                'id': self.problems[0],
+                'metadata': {'rerandomize': 'onreset'}
+            }),
+            content_type="application/json"
+        )
+        problem = modulestore('draft').get_item(self.problems[0])
+        self.assertEqual(problem.rerandomize, 'onreset')
+        self.client.post(
+            reverse('save_item'),
+            json.dumps({
+                'id': self.problems[0],
+                'metadata': {'rerandomize': None}
+            }),
+            content_type="application/json"
+        )
+        problem = modulestore('draft').get_item(self.problems[0])
+        self.assertEqual(problem.rerandomize, 'never')
+
+
+    def test_null_field(self):
+        """
+        Sending null in for a field 'deletes' it
+        """
+        problem = modulestore('draft').get_item(self.problems[0])
+        self.assertIsNotNone(problem.markdown)
+        self.client.post(
+            reverse('save_item'),
+            json.dumps({
+                'id': self.problems[0],
+                'nullout': ['markdown']
+            }),
+            content_type="application/json"
+        )
+        problem = modulestore('draft').get_item(self.problems[0])
+        self.assertIsNo/ne(problem.markdown)
diff --git a/cms/djangoapps/contentstore/tests/utils.py b/cms/djangoapps/contentstore/tests/utils.py
index bc9e9e8bae..a3f211a703 100644
--- a/cms/djangoapps/contentstore/tests/utils.py
+++ b/cms/djangoapps/contentstore/tests/utils.py
@@ -54,7 +54,6 @@ class CourseTestCase(ModuleStoreTestCase):
         self.client.login(username=uname, password=password)
 
         self.course = CourseFactory.create(
-            template='i4x://edx/templates/course/Empty',
             org='MITx',
             number='999',
             display_name='Robot Super Course',
diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py
index 5fa0d949b0..4973bddaca 100644
--- a/cms/djangoapps/contentstore/utils.py
+++ b/cms/djangoapps/contentstore/utils.py
@@ -19,14 +19,14 @@ NOTES_PANEL = {"name": _("My Notes"), "type": "notes"}
 EXTRA_TAB_PANELS = dict([(p['type'], p) for p in [OPEN_ENDED_PANEL, NOTES_PANEL]])
 
 
-def get_modulestore(location):
+def get_modulestore(category_or_location):
     """
     Returns the correct modulestore to use for modifying the specified location
     """
-    if not isinstance(location, Location):
-        location = Location(location)
+    if isinstance(category_or_location, Location):
+        category_or_location = category_or_location.category
 
-    if location.category in DIRECT_ONLY_CATEGORIES:
+    if category_or_location in DIRECT_ONLY_CATEGORIES:
         return modulestore('direct')
     else:
         return modulestore()
diff --git a/cms/djangoapps/contentstore/views/checklist.py b/cms/djangoapps/contentstore/views/checklist.py
index fa0a7b7b62..fdb5857ba7 100644
--- a/cms/djangoapps/contentstore/views/checklist.py
+++ b/cms/djangoapps/contentstore/views/checklist.py
@@ -7,11 +7,11 @@ from django.views.decorators.http import require_http_methods
 from django_future.csrf import ensure_csrf_cookie
 from mitxmako.shortcuts import render_to_response
 
-from xmodule.modulestore import Location
 from xmodule.modulestore.inheritance import own_metadata
 
 from ..utils import get_modulestore, get_url_reverse
 from .access import get_location_and_verify_access
+from xmodule.course_module import CourseDescriptor
 
 __all__ = ['get_checklists', 'update_checklist']
 
@@ -28,13 +28,11 @@ def get_checklists(request, org, course, name):
 
     modulestore = get_modulestore(location)
     course_module = modulestore.get_item(location)
-    new_course_template = Location('i4x', 'edx', 'templates', 'course', 'Empty')
-    template_module = modulestore.get_item(new_course_template)
 
     # If course was created before checklists were introduced, copy them over from the template.
     copied = False
     if not course_module.checklists:
-        course_module.checklists = template_module.checklists
+        course_module.checklists = CourseDescriptor.checklists.default
         copied = True
 
     checklists, modified = expand_checklist_action_urls(course_module)
diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 30958d5866..13eca522dd 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -26,6 +26,8 @@ from models.settings.course_grading import CourseGradingModel
 
 from .requests import _xmodule_recurse
 from .access import has_access
+from xmodule.x_module import XModuleDescriptor
+from xblock.plugin import PluginMissingError
 
 __all__ = ['OPEN_ENDED_COMPONENT_TYPES',
            'ADVANCED_COMPONENT_POLICY_KEY',
@@ -101,7 +103,7 @@ def edit_subsection(request, location):
     return render_to_response('edit_subsection.html',
                               {'subsection': item,
                                'context_course': course,
-                               'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'),
+                               'new_unit_category': 'vertical',
                                'lms_link': lms_link,
                                'preview_link': preview_link,
                                'course_graders': json.dumps(CourseGradingModel.fetch(course.location).graders),
@@ -134,10 +136,27 @@ def edit_unit(request, location):
         item = modulestore().get_item(location, depth=1)
     except ItemNotFoundError:
         return HttpResponseBadRequest()
-
     lms_link = get_lms_link_for_item(item.location, course_id=course.location.course_id)
 
     component_templates = defaultdict(list)
+    for category in COMPONENT_TYPES:
+        component_class = XModuleDescriptor.load_class(category)
+        # add the default template
+        has_markdown = hasattr(component_class, 'markdown') and component_class.markdown is not None
+        component_templates[category].append((
+            component_class.display_name.default or 'Blank',
+            category,
+            has_markdown,
+            None  # no boilerplate for overrides
+        ))
+        # add boilerplates
+        for template in component_class.templates():
+            component_templates[category].append((
+                template['metadata'].get('display_name'),
+                category,
+                template['metadata'].get('markdown') is not None,
+                template.get('template_id')
+            ))
 
     # Check if there are any advanced modules specified in the course policy. These modules
     # should be specified as a list of strings, where the strings are the names of the modules
@@ -145,29 +164,29 @@ def edit_unit(request, location):
     course_advanced_keys = course.advanced_modules
 
     # Set component types according to course policy file
-    component_types = list(COMPONENT_TYPES)
     if isinstance(course_advanced_keys, list):
-        course_advanced_keys = [c for c in course_advanced_keys if c in ADVANCED_COMPONENT_TYPES]
-        if len(course_advanced_keys) > 0:
-            component_types.append(ADVANCED_COMPONENT_CATEGORY)
+        for category in course_advanced_keys:
+            if category in ADVANCED_COMPONENT_TYPES:
+                # Do I need to allow for boilerplates or just defaults on the class? i.e., can an advanced
+                # have more than one entry in the menu? one for default and others for prefilled boilerplates?
+                try:
+                    component_class = XModuleDescriptor.load_class(category)
+
+                    component_templates['advanced'].append((
+                        component_class.display_name.default or category,
+                        category,
+                        hasattr(component_class, 'markdown') and component_class.markdown is not None,
+                        None  # don't override default data
+                        ))
+                except PluginMissingError:
+                    # dhm: I got this once but it can happen any time the course author configures
+                    # an advanced component which does not exist on the server. This code here merely
+                    # prevents any authors from trying to instantiate the non-existent component type
+                    # by not showing it in the menu
+                    pass
     else:
         log.error("Improper format for course advanced keys! {0}".format(course_advanced_keys))
 
-    templates = modulestore().get_items(Location('i4x', 'edx', 'templates'))
-    for template in templates:
-        category = template.location.category
-
-        if category in course_advanced_keys:
-            category = ADVANCED_COMPONENT_CATEGORY
-
-        if category in component_types:
-            # This is a hack to create categories for different xmodules
-            component_templates[category].append((
-                template.display_name_with_default,
-                template.location.url(),
-                hasattr(template, 'markdown') and template.markdown is not None
-            ))
-
     components = [
         component.location.url()
         for component
@@ -219,7 +238,7 @@ def edit_unit(request, location):
         'subsection': containing_subsection,
         'release_date': get_default_time_display(containing_subsection.lms.start) if containing_subsection.lms.start is not None else None,
         'section': containing_section,
-        'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'),
+        'new_unit_category': 'vertical',
         'unit_state': unit_state,
         'published_date': get_default_time_display(item.cms.published_date) if item.cms.published_date is not None else None
     })
@@ -253,7 +272,7 @@ def create_draft(request):
 
     # This clones the existing item location to a draft location (the draft is implicit,
     # because modulestore is a Draft modulestore)
-    modulestore().clone_item(location, location)
+    modulestore().convert_to_draft(location)
 
     return HttpResponse()
 
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index f8de053d95..4c95d6e06e 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -82,10 +82,11 @@ def course_index(request, org, course, name):
         'sections': sections,
         'course_graders': json.dumps(CourseGradingModel.fetch(course.location).graders),
         'parent_location': course.location,
-        'new_section_template': Location('i4x', 'edx', 'templates', 'chapter', 'Empty'),
-        'new_subsection_template': Location('i4x', 'edx', 'templates', 'sequential', 'Empty'),  # for now they are the same, but the could be different at some point...
+        'new_section_category': 'chapter',
+        'new_subsection_category': 'sequential',
         'upload_asset_callback_url': upload_asset_callback_url,
-        'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty')
+        'new_unit_category': 'vertical',
+        'category': 'vertical'
     })
 
 
@@ -98,12 +99,6 @@ def create_new_course(request):
     if not is_user_in_creator_group(request.user):
         raise PermissionDenied()
 
-    # This logic is repeated in xmodule/modulestore/tests/factories.py
-    # so if you change anything here, you need to also change it there.
-    # TODO: write a test that creates two courses, one with the factory and
-    # the other with this method, then compare them to make sure they are
-    # equivalent.
-    template = Location(request.POST['template'])
     org = request.POST.get('org')
     number = request.POST.get('number')
     display_name = request.POST.get('display_name')
@@ -121,29 +116,26 @@ def create_new_course(request):
         existing_course = modulestore('direct').get_item(dest_location)
     except ItemNotFoundError:
         pass
-
     if existing_course is not None:
         return JsonResponse({'ErrMsg': 'There is already a course defined with this name.'})
 
     course_search_location = ['i4x', dest_location.org, dest_location.course, 'course', None]
     courses = modulestore().get_items(course_search_location)
-
     if len(courses) > 0:
         return JsonResponse({'ErrMsg': 'There is already a course defined with the same organization and course number.'})
 
-    new_course = modulestore('direct').clone_item(template, dest_location)
+    # instantiate the CourseDescriptor and then persist it
+    # note: no system to pass
+    if display_name is None:
+        metadata = {}
+    else:
+        metadata = {'display_name': display_name}
+    modulestore('direct').create_and_save_xmodule(dest_location, metadata=metadata)
+    new_course = modulestore('direct').get_item(dest_location)
 
     # clone a default 'about' module as well
-
-    about_template_location = Location(['i4x', 'edx', 'templates', 'about', 'overview'])
     dest_about_location = dest_location._replace(category='about', name='overview')
-    modulestore('direct').clone_item(about_template_location, dest_about_location)
-
-    if display_name is not None:
-        new_course.display_name = display_name
-
-    # set a default start date to now
-    new_course.start = datetime.datetime.now(UTC())
+    modulestore('direct').create_and_save_xmodule(dest_about_location, system=new_course.system)
 
     initialize_course_tabs(new_course)
 
diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py
index abc5f48564..90dae10c23 100644
--- a/cms/djangoapps/contentstore/views/item.py
+++ b/cms/djangoapps/contentstore/views/item.py
@@ -13,16 +13,26 @@ from util.json_request import expect_json
 from ..utils import get_modulestore
 from .access import has_access
 from .requests import _xmodule_recurse
+from xmodule.x_module import XModuleDescriptor
 
-__all__ = ['save_item', 'clone_item', 'delete_item']
+__all__ = ['save_item', 'create_item', 'delete_item']
 
 # cdodge: these are categories which should not be parented, they are detached from the hierarchy
 DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info']
 
-
 @login_required
 @expect_json
 def save_item(request):
+    """
+    Will carry a json payload with these possible fields
+    :id (required): the id
+    :data (optional): the new value for the data
+    :metadata (optional): new values for the metadata fields.
+        Any whose values are None will be deleted not set to None! Absent ones will be left alone
+    :nullout (optional): which metadata fields to set to None
+    """
+    # The nullout is a bit of a temporary copout until we can make module_edit.coffee and the metadata editors a
+    # little smarter and able to pass something more akin to {unset: [field, field]}
     item_location = request.POST['id']
 
     # check permissions for this user within this course
@@ -42,30 +52,25 @@ def save_item(request):
         children = request.POST['children']
         store.update_children(item_location, children)
 
-    # cdodge: also commit any metadata which might have been passed along in the
-    # POST from the client, if it is there
-    # NOTE, that the postback is not the complete metadata, as there's system metadata which is
-    # not presented to the end-user for editing. So let's fetch the original and
-    # 'apply' the submitted metadata, so we don't end up deleting system metadata
-    if request.POST.get('metadata') is not None:
-        posted_metadata = request.POST['metadata']
-        # fetch original
+    # cdodge: also commit any metadata which might have been passed along
+    if request.POST.get('nullout') is not None or request.POST.get('metadata') is not None:
+        # the postback is not the complete metadata, as there's system metadata which is
+        # not presented to the end-user for editing. So let's fetch the original and
+        # 'apply' the submitted metadata, so we don't end up deleting system metadata
         existing_item = modulestore().get_item(item_location)
+        for metadata_key in request.POST.get('nullout', []):
+            setattr(existing_item, metadata_key, None)
 
         # update existing metadata with submitted metadata (which can be partial)
-        # IMPORTANT NOTE: if the client passed pack 'null' (None) for a piece of metadata that means 'remove it'
-        for metadata_key, value in posted_metadata.items():
+        # IMPORTANT NOTE: if the client passed 'null' (None) for a piece of metadata that means 'remove it'. If
+        # the intent is to make it None, use the nullout field
+        for metadata_key, value in request.POST.get('metadata', {}).items():
 
-            if posted_metadata[metadata_key] is None:
-                # remove both from passed in collection as well as the collection read in from the modulestore
-                if metadata_key in existing_item._model_data:
-                    del existing_item._model_data[metadata_key]
-                del posted_metadata[metadata_key]
+            if value is None:
+                delattr(existing_item, metadata_key)
             else:
-                existing_item._model_data[metadata_key] = value
-
+                setattr(existing_item, metadata_key, value)
         # commit to datastore
-        # TODO (cpennington): This really shouldn't have to do this much reaching in to get the metadata
         store.update_metadata(item_location, own_metadata(existing_item))
 
     return HttpResponse()
@@ -73,28 +78,38 @@ def save_item(request):
 
 @login_required
 @expect_json
-def clone_item(request):
+def create_item(request):
     parent_location = Location(request.POST['parent_location'])
-    template = Location(request.POST['template'])
+    category = request.POST['category']
 
     display_name = request.POST.get('display_name')
 
     if not has_access(request.user, parent_location):
         raise PermissionDenied()
 
-    parent = get_modulestore(template).get_item(parent_location)
-    dest_location = parent_location._replace(category=template.category, name=uuid4().hex)
+    parent = get_modulestore(category).get_item(parent_location)
+    dest_location = parent_location.replace(category=category, name=uuid4().hex)
 
-    new_item = get_modulestore(template).clone_item(template, dest_location)
+    # get the metadata, display_name, and definition from the request
+    metadata = {}
+    data = None
+    template_id = request.POST.get('boilerplate')
+    if template_id is not None:
+        clz = XModuleDescriptor.load_class(category)
+        if clz is not None:
+            template = clz.get_template(template_id)
+            if template is not None:
+                metadata = template.get('metadata', {})
+                data = template.get('data')
 
-    # replace the display name with an optional parameter passed in from the caller
     if display_name is not None:
-        new_item.display_name = display_name
+        metadata['display_name'] = display_name
 
-    get_modulestore(template).update_metadata(new_item.location.url(), own_metadata(new_item))
+    get_modulestore(category).create_and_save_xmodule(dest_location, definition_data=data,
+        metadata=metadata, system=parent.system)
 
-    if new_item.location.category not in DETACHED_CATEGORIES:
-        get_modulestore(parent.location).update_children(parent_location, parent.children + [new_item.location.url()])
+    if category not in DETACHED_CATEGORIES:
+        get_modulestore(parent.location).update_children(parent_location, parent.children + [dest_location.url()])
 
     return HttpResponse(json.dumps({'id': dest_location.url()}))
 
diff --git a/cms/djangoapps/contentstore/views/user.py b/cms/djangoapps/contentstore/views/user.py
index 948ed614d2..ee6b0bf84d 100644
--- a/cms/djangoapps/contentstore/views/user.py
+++ b/cms/djangoapps/contentstore/views/user.py
@@ -27,6 +27,7 @@ def index(request):
     # filter out courses that we don't have access too
     def course_filter(course):
         return (has_access(request.user, course.location)
+                # TODO remove this condition when templates purged from db
                 and course.location.course != 'templates'
                 and course.location.org != ''
                 and course.location.course != ''
@@ -34,7 +35,6 @@ def index(request):
     courses = filter(course_filter, courses)
 
     return render_to_response('index.html', {
-        'new_course_template': Location('i4x', 'edx', 'templates', 'course', 'Empty'),
         'courses': [(course.display_name,
                     get_url_reverse('CourseOutline', course),
                     get_lms_link_for_item(course.location, course_id=course.location.course_id))
diff --git a/cms/djangoapps/models/settings/course_grading.py b/cms/djangoapps/models/settings/course_grading.py
index 4ea9f2f5db..e529a284c6 100644
--- a/cms/djangoapps/models/settings/course_grading.py
+++ b/cms/djangoapps/models/settings/course_grading.py
@@ -9,7 +9,7 @@ class CourseGradingModel(object):
     """
     def __init__(self, course_descriptor):
         self.course_location = course_descriptor.location
-        self.graders = [CourseGradingModel.jsonize_grader(i, grader) for i, grader in enumerate(course_descriptor.raw_grader)]   # weights transformed to ints [0..100]
+        self.graders = [CourseGradingModel.jsonize_grader(i, grader) for i, grader in enumerate(course_descriptor.raw_grader)]  # weights transformed to ints [0..100]
         self.grade_cutoffs = course_descriptor.grade_cutoffs
         self.grace_period = CourseGradingModel.convert_set_grace_period(course_descriptor)
 
@@ -81,7 +81,7 @@ class CourseGradingModel(object):
         Decode the json into CourseGradingModel and save any changes. Returns the modified model.
         Probably not the usual path for updates as it's too coarse grained.
         """
-        course_location = jsondict['course_location']
+        course_location = Location(jsondict['course_location'])
         descriptor = get_modulestore(course_location).get_item(course_location)
 
         graders_parsed = [CourseGradingModel.parse_grader(jsonele) for jsonele in jsondict['graders']]
@@ -89,7 +89,7 @@ class CourseGradingModel(object):
         descriptor.raw_grader = graders_parsed
         descriptor.grade_cutoffs = jsondict['grade_cutoffs']
 
-        get_modulestore(course_location).update_item(course_location, descriptor._model_data._kvs._data)
+        get_modulestore(course_location).update_item(course_location, descriptor.xblock_kvs._data)
         CourseGradingModel.update_grace_period_from_json(course_location, jsondict['grace_period'])
 
         return CourseGradingModel.fetch(course_location)
@@ -209,7 +209,7 @@ class CourseGradingModel(object):
         descriptor = get_modulestore(location).get_item(location)
         return {"graderType": descriptor.lms.format if descriptor.lms.format is not None else 'Not Graded',
                 "location": location,
-                "id": 99   # just an arbitrary value to
+                "id": 99  # just an arbitrary value to
                 }
 
     @staticmethod
@@ -232,7 +232,7 @@ class CourseGradingModel(object):
         # 5 hours 59 minutes 59 seconds => converted to iso format
         rawgrace = descriptor.lms.graceperiod
         if rawgrace:
-            hours_from_days = rawgrace.days*24
+            hours_from_days = rawgrace.days * 24
             seconds = rawgrace.seconds
             hours_from_seconds = int(seconds / 3600)
             hours = hours_from_days + hours_from_seconds
diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee
index 5154591d6f..62083fa26d 100644
--- a/cms/static/coffee/src/views/module_edit.coffee
+++ b/cms/static/coffee/src/views/module_edit.coffee
@@ -56,14 +56,15 @@ class CMS.Views.ModuleEdit extends Backbone.View
   changedMetadata: ->
     return _.extend(@metadataEditor.getModifiedMetadataValues(), @customMetadata())
 
-  cloneTemplate: (parent, template) ->
-    $.post("/clone_item", {
-      parent_location: parent
-      template: template
-    }, (data) => 
-      @model.set(id: data.id)
-      @$el.data('id', data.id)
-      @render()
+  createItem: (parent, payload) ->
+    payload.parent_location = parent
+    $.post(
+        "/create_item"
+        payload 
+        (data) => 
+            @model.set(id: data.id)
+            @$el.data('id', data.id)
+            @render()
     )
 
   render: ->
diff --git a/cms/static/coffee/src/views/tabs.coffee b/cms/static/coffee/src/views/tabs.coffee
index 1034fc988e..58f52f27a3 100644
--- a/cms/static/coffee/src/views/tabs.coffee
+++ b/cms/static/coffee/src/views/tabs.coffee
@@ -55,9 +55,9 @@ class CMS.Views.TabsEdit extends Backbone.View
       editor.$el.removeClass('new')
     , 500)
 
-    editor.cloneTemplate(
+    editor.createItem(
       @model.get('id'),
-      'i4x://edx/templates/static_tab/Empty'
+      {category: 'static_tab'}
     )
 
     analytics.track "Added Static Page",
diff --git a/cms/static/coffee/src/views/unit.coffee b/cms/static/coffee/src/views/unit.coffee
index 058bcf0ce1..774ef04f6d 100644
--- a/cms/static/coffee/src/views/unit.coffee
+++ b/cms/static/coffee/src/views/unit.coffee
@@ -89,9 +89,9 @@ class CMS.Views.UnitEdit extends Backbone.View
 
     @$newComponentItem.before(editor.$el)
 
-    editor.cloneTemplate(
+    editor.createItem(
       @$el.data('id'),
-      $(event.currentTarget).data('location')
+      $(event.currentTarget).data()
     )
 
     analytics.track "Added a Component",
diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index b53d116808..3d8cd7684e 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -338,7 +338,7 @@ function createNewUnit(e) {
     e.preventDefault();
 
     var parent = $(this).data('parent');
-    var template = $(this).data('template');
+    var category = $(this).data('category');
 
     analytics.track('Created a Unit', {
         'course': course_location_analytics,
@@ -346,9 +346,9 @@ function createNewUnit(e) {
     });
 
 
-    $.post('/clone_item', {
+    $.post('/create_item', {
         'parent_location': parent,
-        'template': template,
+        'category': category,
         'display_name': 'New Unit'
     },
 
@@ -551,7 +551,7 @@ function saveNewSection(e) {
 
     var $saveButton = $(this).find('.new-section-name-save');
     var parent = $saveButton.data('parent');
-    var template = $saveButton.data('template');
+    var category = $saveButton.data('category');
     var display_name = $(this).find('.new-section-name').val();
 
     analytics.track('Created a Section', {
@@ -559,9 +559,9 @@ function saveNewSection(e) {
         'display_name': display_name
     });
 
-    $.post('/clone_item', {
+    $.post('/create_item', {
         'parent_location': parent,
-        'template': template,
+        'category': category,
         'display_name': display_name,
     },
 
@@ -595,7 +595,6 @@ function saveNewCourse(e) {
     e.preventDefault();
 
     var $newCourse = $(this).closest('.new-course');
-    var template = $(this).find('.new-course-save').data('template');
     var org = $newCourse.find('.new-course-org').val();
     var number = $newCourse.find('.new-course-number').val();
     var display_name = $newCourse.find('.new-course-name').val();
@@ -612,7 +611,6 @@ function saveNewCourse(e) {
     });
 
     $.post('/create_new_course', {
-        'template': template,
         'org': org,
         'number': number,
         'display_name': display_name
@@ -646,7 +644,7 @@ function addNewSubsection(e) {
     var parent = $(this).parents("section.branch").data("id");
 
     $saveButton.data('parent', parent);
-    $saveButton.data('template', $(this).data('template'));
+    $saveButton.data('category', $(this).data('category'));
 
     $newSubsection.find('.new-subsection-form').bind('submit', saveNewSubsection);
     $cancelButton.bind('click', cancelNewSubsection);
@@ -659,7 +657,7 @@ function saveNewSubsection(e) {
     e.preventDefault();
 
     var parent = $(this).find('.new-subsection-name-save').data('parent');
-    var template = $(this).find('.new-subsection-name-save').data('template');
+    var category = $(this).find('.new-subsection-name-save').data('category');
     var display_name = $(this).find('.new-subsection-name-input').val();
 
     analytics.track('Created a Subsection', {
@@ -668,9 +666,9 @@ function saveNewSubsection(e) {
     });
 
 
-    $.post('/clone_item', {
+    $.post('/create_item', {
         'parent_location': parent,
-        'template': template,
+        'category': category,
         'display_name': display_name
     },
 
diff --git a/cms/templates/index.html b/cms/templates/index.html
index 57921641ce..f0baef4f09 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -25,8 +25,8 @@
             </div>
           </div>
           <div class="row">
-	    <input type="submit" value="${_('Save')}" class="new-course-save" data-template="${new_course_template}" />
-	    <input type="button" value="${_('Cancel')}" class="new-course-cancel" />
+            <input type="submit" value="${_('Save')}" class="new-course-save"/>
+            <input type="button" value="${_('Cancel')}" class="new-course-cancel" />
           </div>
         </form>
       </div>
diff --git a/cms/templates/overview.html b/cms/templates/overview.html
index ab7788c64a..56836b00ad 100644
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -1,4 +1,4 @@
-<%! from django.utils.translation import ugettext as _ %>
+/<%! from django.utils.translation import ugettext as _ %>
 <%inherit file="base.html" />
 <%!
    import logging
@@ -66,7 +66,8 @@
           <h3 class="section-name">
           <form class="section-name-form">
             <input type="text" value="${_('New Section Name')}" class="new-section-name" />
-            <input type="submit" class="new-section-name-save" data-parent="${parent_location}" data-template="${new_section_template}" value="${_('Save')}" />
+            <input type="submit" class="new-section-name-save" data-parent="${parent_location}"
+                   data-category="${new_section_category}" value="${_('Save')}" />
             <input type="button" class="new-section-name-cancel" value="${_('Cancel')}" /></h3>
           </form>
         </div>
@@ -83,8 +84,9 @@
           <span class="section-name-span">Click here to set the section name</span>
           <form class="section-name-form">
             <input type="text" value="${_('New Section Name')}" class="new-section-name" />
-            <input type="submit" class="new-section-name-save" data-parent="${parent_location}" data-template="${new_section_template}" value="${_('Save')}" />
-            <input type="button" class="new-section-name-cancel" value="${_('Cancel')}" /></h3>
+            <input type="submit" class="new-section-name-save" data-parent="${parent_location}"
+                   data-category="${new_section_category}" value="${_('Save')}" />
+            <input type="button" class="new-section-name-cancel" value="$(_('Cancel')}" /></h3>
           </form>
         </div>
         <div class="item-actions">
@@ -181,7 +183,7 @@
           </header>
           <div class="subsection-list">
             <div class="list-header">
-              <a href="#" class="new-subsection-item" data-template="${new_subsection_template}">
+              <a href="#" class="new-subsection-item" data-category="${new_subsection_category}">
                 <span class="new-folder-icon"></span>${_("New Subsection")}
               </a>
             </div>
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index ce4f239ab1..300d631421 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -59,8 +59,8 @@
                   % if type == 'advanced' or len(templates) > 1:
                     <a href="#" class="multiple-templates" data-type="${type}">
                   % else:
-                    % for __, location, __ in templates:
-                    <a href="#" class="single-template" data-type="${type}" data-location="${location}">
+                    % for __, category, __, __ in templates:
+                    <a href="#" class="single-template" data-type="${type}" data-category="${category}">
                     % endfor
                   % endif
                       <span class="large-template-icon large-${type}-icon"></span>
@@ -74,49 +74,60 @@
                   % if len(templates) > 1 or type == 'advanced':
                 <div class="new-component-templates new-component-${type}">
                     % if type == "problem":
-                      <div class="tab-group tabs">
-                              <ul class="problem-type-tabs nav-tabs">
-                                <li class="current">
-                                  <a class="link-tab" href="#tab1">${_("Common Problem Types")}</a>
-                                </li>
-                                <li>
-                                  <a class="link-tab" href="#tab2">${_("Advanced")}</a>
-                                </li>
-                              </ul>
-                      % endif
-                          <div class="tab current" id="tab1">
-                            <ul class="new-component-template">
-                                % for name, location, has_markdown in templates:
-                                  % if has_markdown or type != "problem":
-                                    <li class="editor-md">
-                                      <a href="#" id="${location}" data-location="${location}">
-                                        <span class="name"> ${name}</span>
-                                      </a>
-                                    </li>
-                                  % endif
-
-                                %endfor
+                    <div class="tab-group tabs">
+                            <ul class="problem-type-tabs nav-tabs">
+                              <li class="current">
+                                <a class="link-tab" href="#tab1">${_("Common Problem Types")}</a>
+                              </li>
+                              <li>
+                                <a class="link-tab" href="#tab2">${_("Advanced")}</a>
+                              </li>
                             </ul>
-                          </div>
-                      % if type == "problem":
-                              <div class="tab" id="tab2">
-                                <ul class="new-component-template">
-                                    % for name, location, has_markdown in templates:
-                                      % if not has_markdown:
-                                        <li class="editor-manual">
-                                          <a href="#" id="${location}" data-location="${location}">
-                                            <span class="name"> ${name}</span>
-                                          </a>
-                                        </li>
-                                      % endif
-                                    % endfor
-                                </ul>
-                              </div>
-                      </div>
-                      % endif
-                      <a href="#" class="cancel-button">${_("Cancel")}</a>
-                  </div>
-                  % endif
+                    % endif
+                    <div class="tab current" id="tab1">
+                      <ul class="new-component-template">
+                          % for name, category, has_markdown, boilerplate_name in sorted(templates):
+                            % if has_markdown or type != "problem":
+                                % if boilerplate_name is None:
+                                  <li class="editor-md empty">
+                                    <a href="#" data-category="${category}">
+                                      <span class="name">${name}</span>
+                                    </a>
+                                  </li>
+
+                                % else:
+                                  <li class="editor-md">
+                                    <a href="#" data-category="${category}"
+                                       data-boilerplate="${boilerplate_name}">
+                                      <span class="name">${name}</span>
+                                    </a>
+                                  </li>
+                                % endif
+                            % endif
+
+                          %endfor
+                      </ul>
+                    </div>
+                    % if type == "problem":
+                        <div class="tab" id="tab2">
+                          <ul class="new-component-template">
+                              % for name, category, has_markdown, boilerplate_name in sorted(templates):
+                                % if not has_markdown:
+                                  <li class="editor-manual">
+                                    <a href="#" data-category="${category}"
+                                       data-boilerplate="${boilerplate_name}">
+                                      <span class="name">${name}</span>
+                                    </a>
+                                  </li>
+                                % endif
+                              % endfor
+                          </ul>
+                        </div>
+                    </div>
+                    % endif
+                    <a href="#" class="cancel-button">Cancel</a>
+                </div>
+                % endif
                 % endfor
             </li>
           </ol>
diff --git a/cms/templates/widgets/units.html b/cms/templates/widgets/units.html
index 5ac05e79eb..62c1fb62d7 100644
--- a/cms/templates/widgets/units.html
+++ b/cms/templates/widgets/units.html
@@ -34,7 +34,7 @@ This def will enumerate through a passed in subsection and list all of the units
   </li>
   % endfor
   <li>
-    <a href="#" class="new-unit-item" data-template="${create_new_unit_template}" data-parent="${subsection.location}">
+    <a href="#" class="new-unit-item" data-category="${new_unit_category}" data-parent="${subsection.location}">
       <span class="new-unit-icon"></span>New Unit
     </a>
   </li>
diff --git a/cms/urls.py b/cms/urls.py
index 6db07dc2ed..711742d89f 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -17,7 +17,7 @@ urlpatterns = ('',  # nopep8
     url(r'^preview_component/(?P<location>.*?)$', 'contentstore.views.preview_component', name='preview_component'),
     url(r'^save_item$', 'contentstore.views.save_item', name='save_item'),
     url(r'^delete_item$', 'contentstore.views.delete_item', name='delete_item'),
-    url(r'^clone_item$', 'contentstore.views.clone_item', name='clone_item'),
+    url(r'^create_item$', 'contentstore.views.create_item', name='create_item'),
     url(r'^create_draft$', 'contentstore.views.create_draft', name='create_draft'),
     url(r'^publish_draft$', 'contentstore.views.publish_draft', name='publish_draft'),
     url(r'^unpublish_unit$', 'contentstore.views.unpublish_unit', name='unpublish_unit'),
diff --git a/common/djangoapps/terrain/course_helpers.py b/common/djangoapps/terrain/course_helpers.py
index 27bf95099d..c62b1a1e79 100644
--- a/common/djangoapps/terrain/course_helpers.py
+++ b/common/djangoapps/terrain/course_helpers.py
@@ -12,7 +12,6 @@ from django.contrib.sessions.middleware import SessionMiddleware
 from student.models import CourseEnrollment
 from xmodule.modulestore.django import modulestore
 from xmodule.contentstore.django import contentstore
-from xmodule.templates import update_templates
 from urllib import quote_plus
 
 
@@ -84,5 +83,4 @@ def clear_courses():
     # from the bash shell to drop it:
     # $ mongo test_xmodule --eval "db.dropDatabase()"
     modulestore().collection.drop()
-    update_templates(modulestore('direct'))
     contentstore().fs_files.drop()
diff --git a/common/djangoapps/tests.py b/common/djangoapps/tests.py
index 8e78ee7f37..4a61a106d4 100644
--- a/common/djangoapps/tests.py
+++ b/common/djangoapps/tests.py
@@ -23,15 +23,15 @@ class TestXmoduleModfiers(ModuleStoreTestCase):
             number='313', display_name='histogram test')
         section = ItemFactory.create(
             parent_location=course.location, display_name='chapter hist',
-            template='i4x://edx/templates/chapter/Empty')
+            category='chapter')
         problem = ItemFactory.create(
             parent_location=section.location, display_name='problem hist 1',
-            template='i4x://edx/templates/problem/Blank_Common_Problem')
+            category='problem')
         problem.has_score = False  # don't trip trying to retrieve db data
 
         late_problem = ItemFactory.create(
             parent_location=section.location, display_name='problem hist 2',
-            template='i4x://edx/templates/problem/Blank_Common_Problem')
+            category='problem')
         late_problem.lms.start = datetime.datetime.now(UTC) + datetime.timedelta(days=32)
         late_problem.has_score = False
 
diff --git a/common/lib/xmodule/xmodule/abtest_module.py b/common/lib/xmodule/xmodule/abtest_module.py
index 2e61076e94..53f080eb3a 100644
--- a/common/lib/xmodule/xmodule/abtest_module.py
+++ b/common/lib/xmodule/xmodule/abtest_module.py
@@ -80,8 +80,6 @@ class ABTestModule(ABTestFields, XModule):
 class ABTestDescriptor(ABTestFields, RawDescriptor, XmlDescriptor):
     module_class = ABTestModule
 
-    template_dir_name = "abtest"
-
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         """
diff --git a/common/lib/xmodule/xmodule/annotatable_module.py b/common/lib/xmodule/xmodule/annotatable_module.py
index 8b1bbc71d3..f80e3e488e 100644
--- a/common/lib/xmodule/xmodule/annotatable_module.py
+++ b/common/lib/xmodule/xmodule/annotatable_module.py
@@ -150,5 +150,4 @@ class AnnotatableModule(AnnotatableFields, XModule):
 
 class AnnotatableDescriptor(AnnotatableFields, RawDescriptor):
     module_class = AnnotatableModule
-    template_dir_name = "annotatable"
     mako_template = "widgets/raw-edit.html"
diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 13f00bb77e..60103a2126 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -290,7 +290,6 @@ class CombinedOpenEndedDescriptor(CombinedOpenEndedFields, RawDescriptor):
 
     has_score = True
     always_recalculate_grades = True
-    template_dir_name = "combinedopenended"
 
     #Specify whether or not to pass in S3 interface
     needs_s3_interface = True
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index ceadee1c15..d4aac5b0ae 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -366,8 +366,6 @@ class CourseFields(object):
 class CourseDescriptor(CourseFields, SequenceDescriptor):
     module_class = SequenceModule
 
-    template_dir_name = 'course'
-
     def __init__(self, *args, **kwargs):
         """
         Expects the same arguments as XModuleDescriptor.__init__
diff --git a/common/lib/xmodule/xmodule/error_module.py b/common/lib/xmodule/xmodule/error_module.py
index a37081c447..db1f998187 100644
--- a/common/lib/xmodule/xmodule/error_module.py
+++ b/common/lib/xmodule/xmodule/error_module.py
@@ -96,6 +96,7 @@ class ErrorDescriptor(ErrorFields, JSONEditingDescriptor):
             'contents': contents,
             'display_name': 'Error: ' + location.name,
             'location': location,
+            'category': 'error'
         }
         return cls(
             system,
@@ -109,12 +110,12 @@ class ErrorDescriptor(ErrorFields, JSONEditingDescriptor):
         }
 
     @classmethod
-    def from_json(cls, json_data, system, error_msg='Error not available'):
+    def from_json(cls, json_data, system, location, error_msg='Error not available'):
         return cls._construct(
             system,
-            json.dumps(json_data, indent=4),
+            json.dumps(json_data, skipkeys=False, indent=4),
             error_msg,
-            location=Location(json_data['location']),
+            location=location
         )
 
     @classmethod
diff --git a/common/lib/xmodule/xmodule/foldit_module.py b/common/lib/xmodule/xmodule/foldit_module.py
index fdab14b58d..c4e9e2d35c 100644
--- a/common/lib/xmodule/xmodule/foldit_module.py
+++ b/common/lib/xmodule/xmodule/foldit_module.py
@@ -184,7 +184,6 @@ class FolditDescriptor(FolditFields, XmlDescriptor, EditingDescriptor):
     filename_extension = "xml"
 
     has_score = True
-    template_dir_name = "foldit"
 
     js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}
     js_module_name = "HTMLEditingDescriptor"
diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py
index e101d90b4c..5a4930ff95 100644
--- a/common/lib/xmodule/xmodule/gst_module.py
+++ b/common/lib/xmodule/xmodule/gst_module.py
@@ -141,7 +141,6 @@ class GraphicalSliderToolModule(GraphicalSliderToolFields, XModule):
 
 class GraphicalSliderToolDescriptor(GraphicalSliderToolFields, MakoModuleDescriptor, XmlDescriptor):
     module_class = GraphicalSliderToolModule
-    template_dir_name = 'graphical_slider_tool'
 
     @classmethod
     def definition_from_xml(cls, xml_object, system):
diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index 9ff2e4d9a8..2c7c9e0b01 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -234,7 +234,7 @@ class StaticTabDescriptor(StaticTabFields, HtmlDescriptor):
     These pieces of course content are treated as HtmlModules but we need to overload where the templates are located
     in order to be able to create new ones
     """
-    template_dir_name = "statictab"
+    template_dir_name = None
     module_class = StaticTabModule
 
 
@@ -261,5 +261,5 @@ class CourseInfoDescriptor(CourseInfoFields, HtmlDescriptor):
     These pieces of course content are treated as HtmlModules but we need to overload where the templates are located
     in order to be able to create new ones
     """
-    template_dir_name = "courseinfo"
+    template_dir_name = None
     module_class = CourseInfoModule
diff --git a/common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee b/common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
index aa077da450..d859a59dda 100644
--- a/common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/combinedopenended/edit_spec.coffee
@@ -11,13 +11,13 @@ describe 'OpenEndedMarkdownEditingDescriptor', ->
       @descriptor = new OpenEndedMarkdownEditingDescriptor($('.combinedopenended-editor'))
       @descriptor.createXMLEditor('replace with markdown')
       saveResult = @descriptor.save()
-      expect(saveResult.metadata.markdown).toEqual(null)
+      expect(saveResult.nullout).toEqual(['markdown'])
       expect(saveResult.data).toEqual('replace with markdown')
     it 'saves xml from the xml editor', ->
       loadFixtures 'combinedopenended-without-markdown.html'
       @descriptor = new OpenEndedMarkdownEditingDescriptor($('.combinedopenended-editor'))
       saveResult = @descriptor.save()
-      expect(saveResult.metadata.markdown).toEqual(null)
+      expect(saveResult.nullout).toEqual(['markdown'])
       expect(saveResult.data).toEqual('xml only')
 
   describe 'insertPrompt', ->
diff --git a/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee b/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
index 5161e658e7..1df9587037 100644
--- a/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
@@ -11,13 +11,13 @@ describe 'MarkdownEditingDescriptor', ->
       @descriptor = new MarkdownEditingDescriptor($('.problem-editor'))
       @descriptor.createXMLEditor('replace with markdown')
       saveResult = @descriptor.save()
-      expect(saveResult.metadata.markdown).toEqual(null)
+      expect(saveResult.nullout).toEqual(['markdown'])
       expect(saveResult.data).toEqual('replace with markdown')
     it 'saves xml from the xml editor', ->
       loadFixtures 'problem-without-markdown.html'
       @descriptor = new MarkdownEditingDescriptor($('.problem-editor'))
       saveResult = @descriptor.save()
-      expect(saveResult.metadata.markdown).toEqual(null)
+      expect(saveResult.nullout).toEqual(['markdown'])
       expect(saveResult.data).toEqual('xml only')
 
   describe 'insertMultipleChoice', ->
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
index 1b7f9bb4fb..4cdd571c65 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
@@ -153,8 +153,7 @@ Write a persuasive essay to a newspaper reflecting your vies on censorship in li
     else
       {
       data: @xml_editor.getValue()
-      metadata:
-        markdown: null
+      nullout: ['markdown']
       }
 
   @insertRubric: (selectedText) ->
diff --git a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
index b723f230e9..bd2871eb61 100644
--- a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
@@ -123,9 +123,8 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
         }
     else
        {
-            data: @xml_editor.getValue()
-            metadata:
-               markdown: null
+          data: @xml_editor.getValue()
+          nullout: ['markdown']
        }
 
   @insertMultipleChoice: (selectedText) ->
diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index 2fa12e2e90..eb721dfc99 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -310,14 +310,7 @@ class ModuleStore(object):
         """
         raise NotImplementedError
 
-    def clone_item(self, source, location):
-        """
-        Clone a new item that is a copy of the item at the location `source`
-        and writes it to `location`
-        """
-        raise NotImplementedError
-
-    def update_item(self, location, data):
+    def update_item(self, location, data, allow_not_found=False):
         """
         Set the data in the item specified by the location to
         data
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/base.py b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
index f56393d75e..0b1c601a2f 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo/base.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
@@ -33,7 +33,7 @@ from xblock.runtime import DbModel, KeyValueStore, InvalidScopeError
 from xblock.core import Scope
 
 from xmodule.modulestore import ModuleStoreBase, Location, namedtuple_to_son
-from xmodule.modulestore.exceptions import ItemNotFoundError, DuplicateItemError
+from xmodule.modulestore.exceptions import ItemNotFoundError
 from xmodule.modulestore.inheritance import own_metadata, INHERITABLE_METADATA, inherit_metadata
 
 log = logging.getLogger(__name__)
@@ -62,11 +62,12 @@ class MongoKeyValueStore(KeyValueStore):
     A KeyValueStore that maps keyed data access to one of the 3 data areas
     known to the MongoModuleStore (data, children, and metadata)
     """
-    def __init__(self, data, children, metadata, location):
+    def __init__(self, data, children, metadata, location, category):
         self._data = data
         self._children = children
         self._metadata = metadata
         self._location = location
+        self._category = category
 
     def get(self, key):
         if key.scope == Scope.children:
@@ -78,6 +79,8 @@ class MongoKeyValueStore(KeyValueStore):
         elif key.scope == Scope.content:
             if key.field_name == 'location':
                 return self._location
+            elif key.field_name == 'category':
+                return self._category
             elif key.field_name == 'data' and not isinstance(self._data, dict):
                 return self._data
             else:
@@ -93,6 +96,8 @@ class MongoKeyValueStore(KeyValueStore):
         elif key.scope == Scope.content:
             if key.field_name == 'location':
                 self._location = value
+            elif key.field_name == 'category':
+                self._category = value
             elif key.field_name == 'data' and not isinstance(self._data, dict):
                 self._data = value
             else:
@@ -109,6 +114,8 @@ class MongoKeyValueStore(KeyValueStore):
         elif key.scope == Scope.content:
             if key.field_name == 'location':
                 self._location = Location(None)
+            elif key.field_name == 'category':
+                self._category = None
             elif key.field_name == 'data' and not isinstance(self._data, dict):
                 self._data = None
             else:
@@ -123,7 +130,10 @@ class MongoKeyValueStore(KeyValueStore):
             return key.field_name in self._metadata
         elif key.scope == Scope.content:
             if key.field_name == 'location':
+                # WHY TRUE? if it's been deleted should it be False?
                 return True
+            elif key.field_name == 'category':
+                return self._category is not None
             elif key.field_name == 'data' and not isinstance(self._data, dict):
                 return True
             else:
@@ -185,8 +195,9 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
         else:
             # load the module and apply the inherited metadata
             try:
+                category = json_data['location']['category']
                 class_ = XModuleDescriptor.load_class(
-                    json_data['location']['category'],
+                    category,
                     self.default_class
                 )
                 definition = json_data.get('definition', {})
@@ -201,9 +212,12 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
                     definition.get('children', []),
                     metadata,
                     location,
+                    category
                 )
 
                 model_data = DbModel(kvs, class_, None, MongoUsage(self.course_id, location))
+                model_data['category'] = category
+                model_data['location'] = location
                 module = class_(self, model_data)
                 if self.cached_metadata is not None:
                     # parent container pointers don't differentiate between draft and non-draft
@@ -217,6 +231,7 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
                 return ErrorDescriptor.from_json(
                     json_data,
                     self,
+                    json_data['location'],
                     error_msg=exc_info_to_str(sys.exc_info())
                 )
 
@@ -582,51 +597,97 @@ class MongoModuleStore(ModuleStoreBase):
         modules = self._load_items(list(items), depth)
         return modules
 
-    def clone_item(self, source, location):
+    def create_xmodule(self, location, definition_data=None, metadata=None, system=None):
         """
-        Clone a new item that is a copy of the item at the location `source`
-        and writes it to `location`
+        Create the new xmodule but don't save it. Returns the new module.
+
+        :param location: a Location--must have a category
+        :param definition_data: can be empty. The initial definition_data for the kvs
+        :param metadata: can be empty, the initial metadata for the kvs
+        :param system: if you already have an xmodule from the course, the xmodule.system value
         """
-        item = None
-        try:
-            source_item = self.collection.find_one(location_to_query(source))
-
-            # allow for some programmatically generated substitutions in metadata, e.g. Discussion_id's should be auto-generated
-            for key in source_item['metadata'].keys():
-                if source_item['metadata'][key] == '$$GUID$$':
-                    source_item['metadata'][key] = uuid4().hex
-
-            source_item['_id'] = Location(location).dict()
-            self.collection.insert(
-                source_item,
-                # Must include this to avoid the django debug toolbar (which defines the deprecated "safe=False")
-                # from overriding our default value set in the init method.
-                safe=self.collection.safe
+        if not isinstance(location, Location):
+            location = Location(location)
+        # differs from split mongo in that I believe most of this logic should be above the persistence
+        # layer but added it here to enable quick conversion. I'll need to reconcile these.
+        if metadata is None:
+            metadata = {}
+        if system is None:
+            system = CachingDescriptorSystem(
+                self,
+                {},
+                self.default_class,
+                None,
+                self.error_tracker,
+                self.render_template,
+                {}
             )
-            item = self._load_items([source_item])[0]
+        xblock_class = XModuleDescriptor.load_class(location.category, self.default_class)
+        if definition_data is None:
+            if hasattr(xblock_class, 'data') and getattr(xblock_class, 'data').default is not None:
+                definition_data = getattr(xblock_class, 'data').default
+            else:
+                definition_data = {}
+        dbmodel = self._create_new_model_data(location.category, location, definition_data, metadata)
+        xmodule = xblock_class(system, dbmodel)
+        # force inherited fields w/ defaults to take the defaults so the children can inherit
+        for attr in INHERITABLE_METADATA:
+            if hasattr(xmodule, attr):
+                xmodule._model_data[attr] = getattr(xmodule, attr)
+        return xmodule
 
-            # VS[compat] cdodge: This is a hack because static_tabs also have references from the course module, so
-            # if we add one then we need to also add it to the policy information (i.e. metadata)
-            # we should remove this once we can break this reference from the course to static tabs
-            if location.category == 'static_tab':
-                course = self.get_course_for_item(item.location)
-                existing_tabs = course.tabs or []
-                existing_tabs.append({
-                    'type': 'static_tab',
-                    'name': item.display_name,
-                    'url_slug': item.location.name
-                })
-                course.tabs = existing_tabs
-                self.update_metadata(course.location, course._model_data._kvs._metadata)
-
-        except pymongo.errors.DuplicateKeyError:
-            raise DuplicateItemError(location)
+    def save_xmodule(self, xmodule):
+        """
+        Save the given xmodule (will either create or update based on whether id already exists).
+        Pulls out the data definition v metadata v children locally but saves it all.
 
+        :param xmodule:
+        """
+        # split mongo's persist_dag is more general and useful.
+        self.collection.save({
+                '_id': xmodule.location.dict(),
+                'metadata': own_metadata(xmodule),
+                'definition': {
+                    'data': xmodule.xblock_kvs._data,
+                    'children': xmodule.children if xmodule.has_children else []
+                }
+            })
         # recompute (and update) the metadata inheritance tree which is cached
-        self.refresh_cached_metadata_inheritance_tree(Location(location))
-        self.fire_updated_modulestore_signal(get_course_id_no_run(Location(location)), Location(location))
+        self.refresh_cached_metadata_inheritance_tree(xmodule.location)
+        self.fire_updated_modulestore_signal(get_course_id_no_run(xmodule.location), xmodule.location)
 
-        return item
+    def create_and_save_xmodule(self, location, definition_data=None, metadata=None, system=None):
+        """
+        Create the new xmodule and save it. Does not return the new module because if the caller
+        will insert it as a child, it's inherited metadata will completely change. The difference
+        between this and just doing create_xmodule and save_xmodule is this ensures static_tabs get
+        pointed to by the course.
+
+        :param location: a Location--must have a category
+        :param definition_data: can be empty. The initial definition_data for the kvs
+        :param metadata: can be empty, the initial metadata for the kvs
+        :param system: if you already have an xmodule from the course, the xmodule.system value
+        """
+        # differs from split mongo in that I believe most of this logic should be above the persistence
+        # layer but added it here to enable quick conversion. I'll need to reconcile these.
+        new_object = self.create_xmodule(location, definition_data, metadata, system)
+        location = new_object.location
+        self.save_xmodule(new_object)
+
+        # VS[compat] cdodge: This is a hack because static_tabs also have references from the course module, so
+        # if we add one then we need to also add it to the policy information (i.e. metadata)
+        # we should remove this once we can break this reference from the course to static tabs
+        # TODO move this special casing to app tier (similar to attaching new element to parent)
+        if location.category == 'static_tab':
+            course = self.get_course_for_item(location)
+            existing_tabs = course.tabs or []
+            existing_tabs.append({
+                'type': 'static_tab',
+                'name': new_object.display_name,
+                'url_slug': new_object.location.name
+            })
+            course.tabs = existing_tabs
+            self.update_metadata(course.location, course.xblock_kvs._metadata)
 
     def fire_updated_modulestore_signal(self, course_id, location):
         """
@@ -683,7 +744,7 @@ class MongoModuleStore(ModuleStoreBase):
         if result['n'] == 0:
             raise ItemNotFoundError(location)
 
-    def update_item(self, location, data):
+    def update_item(self, location, data, allow_not_found=False):
         """
         Set the data in the item specified by the location to
         data
@@ -691,8 +752,11 @@ class MongoModuleStore(ModuleStoreBase):
         location: Something that can be passed to Location
         data: A nested dictionary of problem data
         """
-
-        self._update_single_item(location, {'definition.data': data})
+        try:
+            self._update_single_item(location, {'definition.data': data})
+        except ItemNotFoundError:
+            if not allow_not_found:
+                raise
 
     def update_children(self, location, children):
         """
@@ -775,3 +839,24 @@ class MongoModuleStore(ModuleStoreBase):
         are loaded on demand, rather than up front
         """
         return {}
+
+    def _create_new_model_data(self, category, location, definition_data, metadata):
+        """
+        To instantiate a new xmodule which will be saved latter, set up the dbModel and kvs
+        """
+        kvs = MongoKeyValueStore(
+            definition_data,
+            [],
+            metadata,
+            location,
+            category
+        )
+
+        class_ = XModuleDescriptor.load_class(
+                    category,
+                    self.default_class
+                )
+        model_data = DbModel(kvs, class_, None, MongoUsage(None, location))
+        model_data['category'] = category
+        model_data['location'] = location
+        return model_data
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/draft.py b/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
index f34c3a53f9..d289e03739 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo/draft.py
@@ -8,11 +8,12 @@ and otherwise returns i4x://org/course/cat/name).
 
 from datetime import datetime
 
-from xmodule.modulestore import Location, namedtuple_to_son
-from xmodule.modulestore.exceptions import ItemNotFoundError
-from xmodule.modulestore.inheritance import own_metadata
 from xmodule.exceptions import InvalidVersionError
-from xmodule.modulestore.mongo.base import MongoModuleStore
+from xmodule.modulestore import Location, namedtuple_to_son
+from xmodule.modulestore.exceptions import ItemNotFoundError, DuplicateItemError
+from xmodule.modulestore.inheritance import own_metadata
+from xmodule.modulestore.mongo.base import location_to_query, get_course_id_no_run, MongoModuleStore
+import pymongo
 from pytz import UTC
 
 DRAFT = 'draft'
@@ -92,6 +93,21 @@ class DraftModuleStore(MongoModuleStore):
         except ItemNotFoundError:
             return wrap_draft(super(DraftModuleStore, self).get_instance(course_id, location, depth=depth))
 
+    def create_xmodule(self, location, definition_data=None, metadata=None, system=None):
+        """
+        Create the new xmodule but don't save it. Returns the new module with a draft locator
+
+        :param location: a Location--must have a category
+        :param definition_data: can be empty. The initial definition_data for the kvs
+        :param metadata: can be empty, the initial metadata for the kvs
+        :param system: if you already have an xmodule from the course, the xmodule.system value
+        """
+        draft_loc = as_draft(location)
+        if draft_loc.category in DIRECT_ONLY_CATEGORIES:
+            raise InvalidVersionError(location)
+        return super(DraftModuleStore, self).create_xmodule(draft_loc, definition_data, metadata, system)
+
+
     def get_items(self, location, course_id=None, depth=0):
         """
         Returns a list of XModuleDescriptor instances for the items
@@ -119,14 +135,26 @@ class DraftModuleStore(MongoModuleStore):
         ]
         return [wrap_draft(item) for item in draft_items + non_draft_items]
 
-    def clone_item(self, source, location):
+    def convert_to_draft(self, source_location):
         """
-        Clone a new item that is a copy of the item at the location `source`
-        and writes it to `location`
+        Create a copy of the source and mark its revision as draft.
+
+        :param source: the location of the source (its revision must be None)
         """
-        if Location(location).category in DIRECT_ONLY_CATEGORIES:
-            raise InvalidVersionError(location)
-        return wrap_draft(super(DraftModuleStore, self).clone_item(source, as_draft(location)))
+        original = self.collection.find_one(location_to_query(source_location))
+        draft_location = as_draft(source_location)
+        if draft_location.category in DIRECT_ONLY_CATEGORIES:
+            raise InvalidVersionError(source_location)
+        original['_id'] = draft_location.dict()
+        try:
+            self.collection.insert(original)
+        except pymongo.errors.DuplicateKeyError:
+            raise DuplicateItemError(original['_id'])
+
+        self.refresh_cached_metadata_inheritance_tree(draft_location)
+        self.fire_updated_modulestore_signal(get_course_id_no_run(draft_location), draft_location)
+
+        return self._load_items([original])[0]
 
     def update_item(self, location, data, allow_not_found=False):
         """
@@ -140,7 +168,7 @@ class DraftModuleStore(MongoModuleStore):
         try:
             draft_item = self.get_item(location)
             if not getattr(draft_item, 'is_draft', False):
-                self.clone_item(location, draft_loc)
+                self.convert_to_draft(location)
         except ItemNotFoundError, e:
             if not allow_not_found:
                 raise e
@@ -158,7 +186,7 @@ class DraftModuleStore(MongoModuleStore):
         draft_loc = as_draft(location)
         draft_item = self.get_item(location)
         if not getattr(draft_item, 'is_draft', False):
-            self.clone_item(location, draft_loc)
+            self.convert_to_draft(location)
 
         return super(DraftModuleStore, self).update_children(draft_loc, children)
 
@@ -174,7 +202,7 @@ class DraftModuleStore(MongoModuleStore):
         draft_item = self.get_item(location)
 
         if not getattr(draft_item, 'is_draft', False):
-            self.clone_item(location, draft_loc)
+            self.convert_to_draft(location)
 
         if 'is_draft' in metadata:
             del metadata['is_draft']
@@ -218,9 +246,7 @@ class DraftModuleStore(MongoModuleStore):
         """
         Turn the published version into a draft, removing the published version
         """
-        if Location(location).category in DIRECT_ONLY_CATEGORIES:
-            raise InvalidVersionError(location)
-        super(DraftModuleStore, self).clone_item(location, as_draft(location))
+        self.convert_to_draft(location)
         super(DraftModuleStore, self).delete_item(location)
 
     def _query_children_for_cache_children(self, items):
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py b/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
index c32d0bca4c..564aac141d 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
@@ -5,7 +5,6 @@ from django.test import TestCase
 
 from django.conf import settings
 import xmodule.modulestore.django
-from xmodule.templates import update_templates
 from unittest.util import safe_repr
 
 
@@ -110,22 +109,6 @@ class ModuleStoreTestCase(TestCase):
         modulestore.collection.remove(query)
         modulestore.collection.drop()
 
-    @staticmethod
-    def load_templates_if_necessary():
-        """
-        Load templates into the direct modulestore only if they do not already exist.
-        We need the templates, because they are copied to create
-        XModules such as sections and problems.
-        """
-        modulestore = xmodule.modulestore.django.modulestore('direct')
-
-        # Count the number of templates
-        query = {"_id.course": "templates"}
-        num_templates = modulestore.collection.find(query).count()
-
-        if num_templates < 1:
-            update_templates(modulestore)
-
     @classmethod
     def setUpClass(cls):
         """
@@ -169,9 +152,6 @@ class ModuleStoreTestCase(TestCase):
         # Flush anything that is not a template
         ModuleStoreTestCase.flush_mongo_except_templates()
 
-        # Check that we have templates loaded; if not, load them
-        ModuleStoreTestCase.load_templates_if_necessary()
-
         # Call superclass implementation
         super(ModuleStoreTestCase, self)._pre_setup()
 
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/factories.py b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
index 457a88482a..9a0c87ff97 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/factories.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
@@ -1,15 +1,13 @@
-from factory import Factory, lazy_attribute_sequence, lazy_attribute
-from uuid import uuid4
 import datetime
 
+from factory import Factory, LazyAttributeSequence
+from uuid import uuid4
+from pytz import UTC
+
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.inheritance import own_metadata
-from xmodule.x_module import ModuleSystem
-from mitxmako.shortcuts import render_to_string
-from xblock.runtime import InvalidScopeError
-from pytz import UTC
-
+from xmodule.course_module import CourseDescriptor
+from xblock.core import Scope
 
 class XModuleCourseFactory(Factory):
     """
@@ -21,9 +19,8 @@ class XModuleCourseFactory(Factory):
     @classmethod
     def _create(cls, target_class, **kwargs):
 
-        template = Location('i4x', 'edx', 'templates', 'course', 'Empty')
         org = kwargs.pop('org', None)
-        number = kwargs.pop('number', None)
+        number = kwargs.pop('number', kwargs.pop('course', None))
         display_name = kwargs.pop('display_name', None)
         location = Location('i4x', org, number, 'course', Location.clean(display_name))
 
@@ -33,7 +30,7 @@ class XModuleCourseFactory(Factory):
             store = modulestore()
 
         # Write the data to the mongo datastore
-        new_course = store.clone_item(template, location)
+        new_course = store.create_xmodule(location)
 
         # This metadata code was copied from cms/djangoapps/contentstore/views.py
         if display_name is not None:
@@ -56,13 +53,7 @@ class XModuleCourseFactory(Factory):
             setattr(new_course, k, v)
 
         # Update the data in the mongo datastore
-        store.update_metadata(new_course.location, own_metadata(new_course))
-        store.update_item(new_course.location, new_course._model_data._kvs._data)
-
-        # update_item updates the the course as it exists in the modulestore, but doesn't
-        # update the instance we are working with, so have to refetch the course after updating it.
-        new_course = store.get_instance(new_course.id, new_course.location)
-
+        store.save_xmodule(new_course)
         return new_course
 
 
@@ -73,7 +64,6 @@ class Course:
 class CourseFactory(XModuleCourseFactory):
     FACTORY_FOR = Course
 
-    template = 'i4x://edx/templates/course/Empty'
     org = 'MITx'
     number = '999'
     display_name = 'Robot Super Course'
@@ -86,18 +76,14 @@ class XModuleItemFactory(Factory):
 
     ABSTRACT_FACTORY = True
 
-    display_name = None
+    parent_location = 'i4x://MITx/999/course/Robot_Super_Course'
+    category = 'problem'
+    display_name = LazyAttributeSequence(lambda o, n: "{} {}".format(o.category, n))
 
-    @lazy_attribute
-    def category(attr):
-        template = Location(attr.template)
-        return template.category
-
-    @lazy_attribute
-    def location(attr):
-        parent = Location(attr.parent_location)
-        dest_name = attr.display_name.replace(" ", "_") if attr.display_name is not None else uuid4().hex
-        return parent._replace(category=attr.category, name=dest_name)
+    @staticmethod
+    def location(parent, category, display_name):
+        dest_name = display_name.replace(" ", "_") if display_name is not None else uuid4().hex
+        return Location(parent).replace(category=category, name=dest_name)
 
     @classmethod
     def _create(cls, target_class, **kwargs):
@@ -107,8 +93,7 @@ class XModuleItemFactory(Factory):
         *parent_location* (required): the location of the parent module
             (e.g. the parent course or section)
 
-        *template* (required): the template to create the item from
-            (e.g. i4x://templates/section/Empty)
+        category: the category of the resulting item.
 
         *data* (optional): the data for the item
             (e.g. XML problem definition for a problem item)
@@ -121,41 +106,32 @@ class XModuleItemFactory(Factory):
         """
 
         DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info']
-
+        # catch any old style users before they get into trouble
+        assert not 'template' in kwargs
         parent_location = Location(kwargs.get('parent_location'))
-        template = Location(kwargs.get('template'))
         data = kwargs.get('data')
+        category = kwargs.get('category')
         display_name = kwargs.get('display_name')
         metadata = kwargs.get('metadata', {})
+        location = kwargs.get('location', XModuleItemFactory.location(parent_location, category, display_name))
+        assert location != parent_location
 
         store = modulestore('direct')
 
         # This code was based off that in cms/djangoapps/contentstore/views.py
         parent = store.get_item(parent_location)
 
-        new_item = store.clone_item(template, kwargs.get('location'))
-
         # replace the display name with an optional parameter passed in from the caller
         if display_name is not None:
-            new_item.display_name = display_name
+            metadata['display_name'] = display_name
+        # note that location comes from above lazy_attribute
+        store.create_and_save_xmodule(location, metadata=metadata, definition_data=data)
 
-        # Add additional metadata or override current metadata
-        item_metadata = own_metadata(new_item)
-        item_metadata.update(metadata)
-        store.update_metadata(new_item.location.url(), item_metadata)
+        if location.category not in DETACHED_CATEGORIES:
+            parent.children.append(location.url())
+            store.update_children(parent_location, parent.children)
 
-        # replace the data with the optional *data* parameter
-        if data is not None:
-            store.update_item(new_item.location, data)
-
-        if new_item.location.category not in DETACHED_CATEGORIES:
-            store.update_children(parent_location, parent.children + [new_item.location.url()])
-
-        # update_children updates the the item as it exists in the modulestore, but doesn't
-        # update the instance we are working with, so have to refetch the item after updating it.
-        new_item = store.get_item(new_item.location)
-
-        return new_item
+        return store.get_item(location)
 
 
 class Item:
@@ -164,40 +140,4 @@ class Item:
 
 class ItemFactory(XModuleItemFactory):
     FACTORY_FOR = Item
-
-    parent_location = 'i4x://MITx/999/course/Robot_Super_Course'
-    template = 'i4x://edx/templates/chapter/Empty'
-
-    @lazy_attribute_sequence
-    def display_name(attr, n):
-        return "{} {}".format(attr.category.title(), n)
-
-
-def get_test_xmodule_for_descriptor(descriptor):
-    """
-    Attempts to create an xmodule which responds usually correctly from the descriptor. Not guaranteed.
-
-    :param descriptor:
-    """
-    module_sys = ModuleSystem(
-        ajax_url='',
-        track_function=None,
-        get_module=None,
-        render_template=render_to_string,
-        replace_urls=None,
-        xblock_model_data=_test_xblock_model_data_accessor(descriptor)
-    )
-    return descriptor.xmodule(module_sys)
-
-
-def _test_xblock_model_data_accessor(descriptor):
-    simple_map = {}
-    for field in descriptor.fields:
-        try:
-            simple_map[field.name] = getattr(descriptor, field.name)
-        except InvalidScopeError:
-            simple_map[field.name] = field.default
-    for field in descriptor.module_class.fields:
-        if field.name not in simple_map:
-            simple_map[field.name] = field.default
-    return lambda o: simple_map
+    category = 'chapter'
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
index 44e69fb0ed..c149724cc7 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
@@ -9,7 +9,6 @@ from xblock.runtime import KeyValueStore, InvalidScopeError
 from xmodule.modulestore import Location
 from xmodule.modulestore.mongo import MongoModuleStore, MongoKeyValueStore
 from xmodule.modulestore.xml_importer import import_from_xml
-from xmodule.templates import update_templates
 
 from .test_modulestore import check_path_to_location
 from . import DATA_DIR
@@ -51,7 +50,6 @@ class TestMongoModuleStore(object):
         # Explicitly list the courses to load (don't want the big one)
         courses = ['toy', 'simple']
         import_from_xml(store, DATA_DIR, courses)
-        update_templates(store)
         return store
 
     @staticmethod
@@ -126,7 +124,7 @@ class TestMongoKeyValueStore(object):
         self.location = Location('i4x://org/course/category/name@version')
         self.children = ['i4x://org/course/child/a', 'i4x://org/course/child/b']
         self.metadata = {'meta': 'meta_val'}
-        self.kvs = MongoKeyValueStore(self.data, self.children, self.metadata, self.location)
+        self.kvs = MongoKeyValueStore(self.data, self.children, self.metadata, self.location, 'category')
 
     def _check_read(self, key, expected_value):
         assert_equals(expected_value, self.kvs.get(key))
diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py
index 26c8b9bfca..012740ff9a 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml.py
@@ -463,7 +463,10 @@ class XMLModuleStore(ModuleStoreBase):
                     # tabs are referenced in policy.json through a 'slug' which is just the filename without the .html suffix
                     slug = os.path.splitext(os.path.basename(filepath))[0]
                     loc = Location('i4x', course_descriptor.location.org, course_descriptor.location.course, category, slug)
-                    module = HtmlDescriptor(system, {'data': html, 'location': loc})
+                    module = HtmlDescriptor(
+                        system,
+                        {'data': html, 'location': loc, 'category': category}
+                    )
                     # VS[compat]:
                     # Hack because we need to pull in the 'display_name' for static tabs (because we need to edit them)
                     # from the course policy
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
index 1fe62035e6..60eb9dc749 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
@@ -810,7 +810,6 @@ class CombinedOpenEndedV1Descriptor():
     filename_extension = "xml"
 
     has_score = True
-    template_dir_name = "combinedopenended"
 
     def __init__(self, system):
         self.system = system
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
index 0f0851fbf7..8d8a85f788 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
@@ -730,7 +730,6 @@ class OpenEndedDescriptor():
     filename_extension = "xml"
 
     has_score = True
-    template_dir_name = "openended"
 
     def __init__(self, system):
         self.system = system
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
index a5498289e2..1262e1f68f 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
@@ -287,7 +287,6 @@ class SelfAssessmentDescriptor():
     filename_extension = "xml"
 
     has_score = True
-    template_dir_name = "selfassessment"
 
     def __init__(self, system):
         self.system = system
diff --git a/common/lib/xmodule/xmodule/peer_grading_module.py b/common/lib/xmodule/xmodule/peer_grading_module.py
index c88a2e1b38..03003ed1e5 100644
--- a/common/lib/xmodule/xmodule/peer_grading_module.py
+++ b/common/lib/xmodule/xmodule/peer_grading_module.py
@@ -613,7 +613,6 @@ class PeerGradingDescriptor(PeerGradingFields, RawDescriptor):
 
     has_score = True
     always_recalculate_grades = True
-    template_dir_name = "peer_grading"
 
     #Specify whether or not to pass in open ended interface
     needs_open_ended_interface = True
diff --git a/common/lib/xmodule/xmodule/poll_module.py b/common/lib/xmodule/xmodule/poll_module.py
index ca12f239ab..8e7407752a 100644
--- a/common/lib/xmodule/xmodule/poll_module.py
+++ b/common/lib/xmodule/xmodule/poll_module.py
@@ -140,7 +140,6 @@ class PollDescriptor(PollFields, MakoModuleDescriptor, XmlDescriptor):
     _child_tag_name = 'answer'
 
     module_class = PollModule
-    template_dir_name = 'poll'
 
     @classmethod
     def definition_from_xml(cls, xml_object, system):
diff --git a/common/lib/xmodule/xmodule/templates.py b/common/lib/xmodule/xmodule/templates.py
index 6479b3df24..8e350bb618 100644
--- a/common/lib/xmodule/xmodule/templates.py
+++ b/common/lib/xmodule/xmodule/templates.py
@@ -1,34 +1,18 @@
 """
-This module handles loading xmodule templates from disk into the modulestore.
-These templates are used by the CMS to provide baseline content that
-can be cloned when adding new modules to a course.
+This module handles loading xmodule templates
+These templates are used by the CMS to provide content that overrides xmodule defaults for
+samples.
 
-`Template`s are defined in x_module. They contain 3 attributes:
-    metadata: A dictionary with the template metadata. This should contain
-        any values for fields
-            * with scope Scope.settings
-            * that have values different than the field defaults
-            * and that are to be editable in Studio
-    data: A JSON value that defines the template content. This should be a dictionary
-        containing values for fields
-            * with scope Scope.content
-            * that have values different than the field defaults
-            * and that are to be editable in Studio
-        or, if the module uses a single Scope.content String field named `data`, this
-        should be a string containing the contents of that field
-    children: A list of Location urls that define the template children
-
-Templates are defined on XModuleDescriptor types, in the template attribute.
+``Template``s are defined in x_module. They contain 2 attributes:
+    :metadata: A dictionary with the template metadata
+    :data: A JSON value that defines the template content
 """
 
-
+# should this move to cms since it's really only for module crud?
 import logging
-from fs.memoryfs import MemoryFS
 
 from collections import defaultdict
 from .x_module import XModuleDescriptor
-from .mako_module import MakoDescriptorSystem
-from .modulestore import Location
 
 log = logging.getLogger(__name__)
 
@@ -37,73 +21,9 @@ def all_templates():
     """
     Returns all templates for enabled modules, grouped by descriptor type
     """
-
+    # TODO use memcache to memoize w/ expiration
     templates = defaultdict(list)
     for category, descriptor in XModuleDescriptor.load_classes():
         templates[category] = descriptor.templates()
 
     return templates
-
-
-class TemplateTestSystem(MakoDescriptorSystem):
-    """
-    This system exists to help verify that XModuleDescriptors can be instantiated
-    from their defined templates before we load the templates into the modulestore.
-    """
-    def __init__(self):
-        super(TemplateTestSystem, self).__init__(
-            lambda *a, **k: None,
-            MemoryFS(),
-            lambda msg: None,
-            render_template=lambda *a, **k: None,
-        )
-
-
-def update_templates(modulestore):
-    """
-    Updates the set of templates in the modulestore with all templates currently
-    available from the installed plugins
-    """
-
-    # cdodge: build up a list of all existing templates. This will be used to determine which
-    # templates have been removed from disk - and thus we need to remove from the DB
-    templates_to_delete = modulestore.get_items(['i4x', 'edx', 'templates', None, None, None])
-
-    for category, templates in all_templates().items():
-        for template in templates:
-            if 'display_name' not in template.metadata:
-                log.warning('No display_name specified in template {0}, skipping'.format(template))
-                continue
-
-            template_location = Location('i4x', 'edx', 'templates', category, Location.clean_for_url_name(template.metadata['display_name']))
-
-            try:
-                json_data = {
-                    'definition': {
-                        'data': template.data,
-                        'children': template.children
-                    },
-                    'metadata': template.metadata
-                }
-                json_data['location'] = template_location.dict()
-
-                XModuleDescriptor.load_from_json(json_data, TemplateTestSystem())
-            except:
-                log.warning('Unable to instantiate {cat} from template {template}, skipping'.format(
-                    cat=category,
-                    template=template
-                ), exc_info=True)
-                continue
-
-            modulestore.update_item(template_location, template.data)
-            modulestore.update_children(template_location, template.children)
-            modulestore.update_metadata(template_location, template.metadata)
-
-            # remove template from list of templates to delete
-            templates_to_delete = [t for t in templates_to_delete if t.location != template_location]
-
-    # now remove all templates which appear to have removed from disk
-    if len(templates_to_delete) > 0:
-        logging.debug('deleting dangling templates = {0}'.format(templates_to_delete))
-        for template in templates_to_delete:
-            modulestore.delete_item(template.location)
diff --git a/common/lib/xmodule/xmodule/templates/about/empty.yaml b/common/lib/xmodule/xmodule/templates/about/empty.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/about/empty.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/annotatable/default.yaml b/common/lib/xmodule/xmodule/templates/annotatable/default.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/annotatable/default.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml b/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/course/empty.yaml b/common/lib/xmodule/xmodule/templates/course/empty.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/course/empty.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/courseinfo/empty.yaml b/common/lib/xmodule/xmodule/templates/courseinfo/empty.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/courseinfo/empty.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/default/empty.yaml b/common/lib/xmodule/xmodule/templates/default/empty.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/default/empty.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/discussion/default.yaml b/common/lib/xmodule/xmodule/templates/discussion/default.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/discussion/default.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/html/announcement.yaml b/common/lib/xmodule/xmodule/templates/html/announcement.yaml
index 30a8ccb41e..c0ecc61524 100644
--- a/common/lib/xmodule/xmodule/templates/html/announcement.yaml
+++ b/common/lib/xmodule/xmodule/templates/html/announcement.yaml
@@ -21,4 +21,3 @@ data: |
       </section>
       </li>
       </ol>
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/html/empty.yaml b/common/lib/xmodule/xmodule/templates/html/empty.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/html/empty.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/html/everything.yaml b/common/lib/xmodule/xmodule/templates/html/everything.yaml
deleted file mode 100644
index 348ce64fa1..0000000000
--- a/common/lib/xmodule/xmodule/templates/html/everything.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-metadata:
-      display_name: Announcement
-
-data: |
-      <h1>Heading of document</h1>
-      <h2>First subheading</h2>
-      <p>This is a paragraph. It will take care of line breaks for you.</p><p>HTML only parses the location
-      
-      of tags for inserting line breaks into your doc, not 
-      line
-      breaks
-      you
-      add
-      yourself.
-      </p>
-      <h2>Links</h2>
-      <p>You can refer to other parts of the internet with a <a href="http://www.wikipedia.org/"> link</a>, to other parts of your course by prepending your link with <a href="/course/Week_0">/course/</a></p>
-      <p>Now a list:</p>
-      <ul>
-      <li>An item</li>
-      <li>Another item</li>
-      <li>And yet another</li>
-      </ul>
-      <p>This list has an ordering </p>
-      <ol>
-      <li>An item</li>
-      <li>Another item</li>
-      <li>Yet another item</li>
-      </ol>
-      <p> Note, we have a lot of standard edX styles, so please try to avoid any custom styling, and make sure that you make a note of any custom styling that you do yourself so that we can incorporate it into 
-      tools that other people can use. </p>
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/html/latex_html.yaml b/common/lib/xmodule/xmodule/templates/html/latex_html.yaml
index ba5c4b5c06..2db7e98c65 100644
--- a/common/lib/xmodule/xmodule/templates/html/latex_html.yaml
+++ b/common/lib/xmodule/xmodule/templates/html/latex_html.yaml
@@ -19,4 +19,3 @@ data: |
           It is very convenient to write complex equations in LaTeX.
         </p>
     </html>
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/peer_grading/default.yaml b/common/lib/xmodule/xmodule/templates/peer_grading/default.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/peer_grading/default.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml b/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml
index 3b051f2ba8..1717bb91ad 100644
--- a/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml
@@ -1,9 +1,9 @@
-
 ---
 metadata:
     display_name: Circuit Schematic Builder
     rerandomize: never
     showanswer: finished
+    markdown: !!null
 data: |
       <problem >
         Please make a voltage divider that splits the provided voltage evenly.
diff --git a/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml b/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml
index 48feef481b..05de74f28c 100644
--- a/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml
@@ -1,50 +1,47 @@
 ---
 metadata:
     display_name: Custom Python-Evaluated Input
-    rerandomize: never
-    showanswer: finished
+    markdown: !!null
 data: |
-  <problem>
-  <p>
-  A custom python-evaluated input problem accepts one or more lines of text input from the
-  student, and evaluates the inputs for correctness based on evaluation using a 
-  python script embedded within the problem.
-  </p>
+      <problem>
+      <p>
+      A custom python-evaluated input problem accepts one or more lines of text input from the
+      student, and evaluates the inputs for correctness based on evaluation using a 
+      python script embedded within the problem.
+      </p>
 
-  <script type="loncapa/python">
+      <script type="loncapa/python">
 
-  def test_add(expect, ans):
-      try:
-          a1=int(ans[0])
-          a2=int(ans[1])
-          return (a1+a2) == int(expect)
-      except ValueError:
-          return False
+      def test_add(expect, ans):
+          try:
+              a1=int(ans[0])
+              a2=int(ans[1])
+              return (a1+a2) == int(expect)
+          except ValueError:
+              return False
 
-  def test_add_to_ten(expect, ans):
-      return test_add(10, ans)
+      def test_add_to_ten(expect, ans):
+          return test_add(10, ans)
 
-  </script>
+      </script>
 
-  <p>Enter two integers which sum to 10: </p>
-  <customresponse cfn="test_add_to_ten">
-          <textline size="40" correct_answer="3"/><br/>
-          <textline size="40" correct_answer="7"/>
-  </customresponse>
+      <p>Enter two integers which sum to 10: </p>
+      <customresponse cfn="test_add_to_ten">
+              <textline size="40" correct_answer="3"/><br/>
+              <textline size="40" correct_answer="7"/>
+      </customresponse>
 
-  <p>Enter two integers which sum to 20: </p>
-  <customresponse cfn="test_add" expect="20">
-          <textline size="40" correct_answer="11"/><br/>
-          <textline size="40" correct_answer="9"/>
-  </customresponse>
-
-      <solution>
-          <div class="detailed-solution">
-              <p>Explanation</p>
-              <p>Any set of integers on the line \(y = 10 - x\) and \(y = 20 - x\) satisfy these constraints.</p>
-              <img src="/static/images/simple_graph.png"/>
-          </div>
-      </solution>
-  </problem>
-
-children: []
+      <p>Enter two integers which sum to 20: </p>
+      <customresponse cfn="test_add" expect="20">
+              <textline size="40" correct_answer="11"/><br/>
+              <textline size="40" correct_answer="9"/>
+      </customresponse>
+    
+          <solution>
+              <div class="detailed-solution">
+                  <p>Explanation</p>
+                  <p>Any set of integers on the line \(y = 10 - x\) and \(y = 20 - x\) satisfy these constraints.</p>
+                  <img src="/static/images/simple_graph.png"/>
+              </div>
+          </solution>
+      </problem>
diff --git a/common/lib/xmodule/xmodule/templates/problem/empty.yaml b/common/lib/xmodule/xmodule/templates/problem/empty.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/problem/empty.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml b/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml
deleted file mode 100644
index 3d696ec2fd..0000000000
--- a/common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-metadata:
-    display_name: Blank Advanced Problem
-    rerandomize: never
-    showanswer: finished
-data: |
-  <problem>
-  </problem>
-
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml b/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml
index 0401a01c31..4cf877bd1f 100644
--- a/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml
@@ -3,6 +3,7 @@ metadata:
     display_name: Math Expression Input
     rerandomize: never
     showanswer: finished
+    markdown: !!null
 data: |
   <problem>
   <p>
@@ -43,5 +44,3 @@ data: |
           </div>
       </solution>
   </problem>
-
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml
index ab1f22e3b2..566997671d 100644
--- a/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml
@@ -3,6 +3,7 @@ metadata:
     display_name: Image Mapped Input
     rerandomize: never
     showanswer: finished
+    markdown: !!null
 data: |
   <problem>
   <p>
@@ -21,6 +22,3 @@ data: |
           </div>
       </solution>
   </problem>
-
-    
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/problem/latex_problem.yaml b/common/lib/xmodule/xmodule/templates/problem/latex_problem.yaml
index 82d7e8c1ae..097055cfe3 100644
--- a/common/lib/xmodule/xmodule/templates/problem/latex_problem.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/latex_problem.yaml
@@ -85,6 +85,7 @@ metadata:
         can contain equations: $\alpha = \frac{2}{\sqrt{1+\gamma}}$ }
         
         This is some text after the showhide example.
+    markdown: !!null
 
 data: |
     <?xml version="1.0"?>
@@ -214,4 +215,3 @@ data: |
         </p>
       </text>
     </problem>
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
index 10d51de280..202fc03b44 100644
--- a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
@@ -3,33 +3,25 @@ metadata:
     display_name: Multiple Choice
     rerandomize: never
     showanswer: finished
-    markdown: 
-       "A multiple choice problem presents radio buttons for student input. Students can only select a single 
+    markdown: |
+       A multiple choice problem presents radio buttons for student input. Students can only select a single 
        option presented. Multiple Choice questions have been the subject of many areas of research due to the early 
        invention and adoption of bubble sheets.
        
-       
        One of the main elements that goes into a good multiple choice question is the existence of good distractors. 
        That is, each of the alternate responses presented to the student should be the result of a plausible mistake 
        that a student might make.
-        
     
        What Apple device competed with the portable CD player?
-       
             ( ) The iPad
-            
             ( ) Napster
-            
             (x) The iPod
-            
             ( ) The vegetable peeler
             
-            
        [explanation]
        The release of the iPod allowed consumers to carry their entire music library with them in a 
        format that did not rely on fragile and energy-intensive spinning disks.
        [explanation]
-       "
 data: |
    <problem>
    <p>
@@ -54,4 +46,3 @@ data: |
            </div>
        </solution>
    </problem>
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
index 548fd94fab..9b2ddec2a7 100644
--- a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
@@ -3,43 +3,33 @@ metadata:
     display_name: Numerical Input
     rerandomize: never
     showanswer: finished
-    markdown: 
-       "A numerical input problem accepts a line of text input from the
+    markdown: |
+       A numerical input problem accepts a line of text input from the
        student, and evaluates the input for correctness based on its
        numerical value.
-       
 
        The answer is correct if it is within a specified numerical tolerance
        of the expected answer.
-       
 
        Enter the numerical value of Pi:
-        
        = 3.14159 +- .02
        
-       
        Enter the approximate value of 502*9:
-        
        = 4518 +- 15%
-       
-    
+
        Enter the number of fingers on a human hand:
-        
        = 5
-       
 
        [explanation]
        Pi, or the the ratio between a circle's circumference to its diameter, is an irrational number 
        known to extreme precision. It is value is approximately equal to 3.14.
-               
+
        Although you can get an exact value by typing 502*9 into a calculator, the result will be close to 
        500*10, or 5,000. The grader accepts any response within 15% of the true value, 4518, so that you 
        can use any estimation technique that you like.
-       
+
        If you look at your hand, you can count that you have five fingers.
        [explanation]
-       "
-
 data: |
    <problem>
    <p>
@@ -83,5 +73,3 @@ data: |
            </div>
        </solution>
    </problem>
-
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
index c2edfb1cbc..8e59f8ae4d 100644
--- a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
@@ -3,19 +3,16 @@ metadata:
     display_name: Dropdown
     rerandomize: never
     showanswer: finished
-    markdown: 
-        "Dropdown problems give a limited set of options for students to respond with, and present those options
+    markdown: |
+        Dropdown problems give a limited set of options for students to respond with, and present those options
         in a format that encourages them to search for a specific answer rather than being immediately presented 
         with options from which to recognize the correct answer.
-        
 
         The answer options and the identification of the correct answer is defined in the <b>optioninput</b> tag.
-        
 
         Translation between Dropdown and __________ is extremely straightforward:
-        
-        [[(Multiple Choice), Text Input, Numerical Input, External Response, Image Response]]
 
+        [[(Multiple Choice), Text Input, Numerical Input, External Response, Image Response]]
 
         [explanation]
         Multiple Choice also allows students to select from a variety of pre-written responses, although the 
@@ -23,7 +20,6 @@ metadata:
         slightly because students are more likely to think of an answer and then search for it rather than 
         relying purely on recognition to answer the question.
         [explanation]
-        "
 data: |
   <problem>
   <p>Dropdown problems give a limited set of options for students to respond with, and present those options
@@ -45,4 +41,3 @@ data: |
           </div>
       </solution>
   </problem>
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml b/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml
index 73a94ed941..0d93cd3c5e 100644
--- a/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml
@@ -46,7 +46,7 @@ metadata:
         enter your answer in upper or lower case, with or without quotes.
         
         \edXabox{type="custom" cfn='test_str' expect='python' hintfn='hint_fn'}
-        
+    markdown: !!null
 data: |
     <?xml version="1.0"?>
     <problem>
@@ -92,4 +92,3 @@ data: |
         </p>
       </text>
     </problem>
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
index 64e3dc062f..9c59ae3bc2 100644
--- a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
@@ -3,16 +3,13 @@ metadata:
     display_name: Text Input
     rerandomize: never
     showanswer: finished
-    # Note, the extra newlines are needed to make the yaml parser add blank lines instead of folding
-    markdown: 
-        "A text input problem accepts a line of text from the 
+    markdown: |
+        A text input problem accepts a line of text from the 
         student, and evaluates the input for correctness based on an expected 
         answer.
-        
     
         The answer is correct if it matches every character of the expected answer. This can be a problem with  
         international spelling, dates, or anything where the format of the answer is not clear.
-         
     
         Which US state has Lansing as its capital?
 
@@ -23,9 +20,8 @@ metadata:
         Lansing is the capital of Michigan, although it is not Michgan's largest city, 
         or even the seat of the county in which it resides.
         [explanation]
-        "
 data: |
-    <problem showanswer="always">
+    <problem>
     <p>
 
     A text input problem accepts a line of text from the
@@ -46,4 +42,3 @@ data: |
             </div>
         </solution>
     </problem>
-children: []
diff --git a/common/lib/xmodule/xmodule/templates/sequence/with_video.yaml b/common/lib/xmodule/xmodule/templates/sequence/with_video.yaml
deleted file mode 100644
index a56d44ebff..0000000000
--- a/common/lib/xmodule/xmodule/templates/sequence/with_video.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-metadata:
-    display_name: Sequence with Video
-    data_dir: a_made_up_name
-data: ''
-children:
-    - 'i4x://edx/templates/video/default'
diff --git a/common/lib/xmodule/xmodule/templates/statictab/empty.yaml b/common/lib/xmodule/xmodule/templates/statictab/empty.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/common/lib/xmodule/xmodule/templates/statictab/empty.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/templates/video/default.yaml b/common/lib/xmodule/xmodule/templates/video/default.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/video/default.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/videoalpha/default.yaml b/common/lib/xmodule/xmodule/templates/videoalpha/default.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/videoalpha/default.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml b/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml
deleted file mode 100644
index 0967ef424b..0000000000
--- a/common/lib/xmodule/xmodule/templates/word_cloud/default.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/common/lib/xmodule/xmodule/tests/test_logic.py b/common/lib/xmodule/xmodule/tests/test_logic.py
index 9be533885c..5fe7aa2832 100644
--- a/common/lib/xmodule/xmodule/tests/test_logic.py
+++ b/common/lib/xmodule/xmodule/tests/test_logic.py
@@ -28,7 +28,8 @@ class LogicTest(unittest.TestCase):
     def setUp(self):
         class EmptyClass:
             """Empty object."""
-            pass
+            url_name = ''
+            category = 'test'
 
         self.system = get_test_system()
         self.descriptor = EmptyClass()
diff --git a/common/lib/xmodule/xmodule/tests/test_xml_module.py b/common/lib/xmodule/xmodule/tests/test_xml_module.py
index 7ccc71dd96..a277ff2900 100644
--- a/common/lib/xmodule/xmodule/tests/test_xml_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_xml_module.py
@@ -141,6 +141,7 @@ class EditableMetadataFieldsTest(unittest.TestCase):
     def get_xml_editable_fields(self, model_data):
         system = get_test_system()
         system.render_template = Mock(return_value="<div>Test Template HTML</div>")
+        model_data['category'] = 'test'
         return XmlDescriptor(runtime=system, model_data=model_data).editable_metadata_fields
 
     def get_descriptor(self, model_data):
diff --git a/common/lib/xmodule/xmodule/video_module.py b/common/lib/xmodule/xmodule/video_module.py
index ebff888f34..381cc9a622 100644
--- a/common/lib/xmodule/xmodule/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module.py
@@ -97,7 +97,6 @@ class VideoDescriptor(VideoFields,
                       MetadataOnlyEditingDescriptor,
                       RawDescriptor):
     module_class = VideoModule
-    template_dir_name = "video"
 
     def __init__(self, *args, **kwargs):
         super(VideoDescriptor, self).__init__(*args, **kwargs)
diff --git a/common/lib/xmodule/xmodule/videoalpha_module.py b/common/lib/xmodule/xmodule/videoalpha_module.py
index 33945c33fc..d8ed8949f1 100644
--- a/common/lib/xmodule/xmodule/videoalpha_module.py
+++ b/common/lib/xmodule/xmodule/videoalpha_module.py
@@ -179,4 +179,3 @@ class VideoAlphaModule(VideoAlphaFields, XModule):
 class VideoAlphaDescriptor(VideoAlphaFields, RawDescriptor):
     """Descriptor for `VideoAlphaModule`."""
     module_class = VideoAlphaModule
-    template_dir_name = "videoalpha"
diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py
index 0528bbfb6c..882e308c77 100644
--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -356,6 +356,7 @@ class XmlDescriptor(XModuleDescriptor):
             if key not in set(f.name for f in cls.fields + cls.lms.fields):
                 model_data['xml_attributes'][key] = value
         model_data['location'] = location
+        model_data['category'] = xml_object.tag
 
         return cls(
             system,
diff --git a/lms/djangoapps/courseware/features/common.py b/lms/djangoapps/courseware/features/common.py
index 0aa079ebac..55e82e0e90 100644
--- a/lms/djangoapps/courseware/features/common.py
+++ b/lms/djangoapps/courseware/features/common.py
@@ -10,7 +10,6 @@ from django.contrib.auth.models import User
 from student.models import CourseEnrollment
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import _MODULESTORES, modulestore
-from xmodule.templates import update_templates
 from xmodule.course_module import CourseDescriptor
 from courseware.courses import get_course_by_id
 from xmodule import seq_module, vertical_module
@@ -39,7 +38,7 @@ def create_course(step, course):
                                        display_name='Test Section')
 
     problem_section = world.ItemFactory.create(parent_location=world.scenario_dict['SECTION'].location,
-                                               template='i4x://edx/templates/sequential/Empty',
+                                               category='sequential'
                                                display_name='Test Section')
 
 
@@ -62,7 +61,7 @@ def i_am_registered_for_the_course(step, course):
 @step(u'The course "([^"]*)" has extra tab "([^"]*)"$')
 def add_tab_to_course(step, course, extra_tab_name):
     section_item = world.ItemFactory.create(parent_location=course_location(course),
-                                            template="i4x://edx/templates/static_tab/Empty",
+                                            category="static_tab",
                                             display_name=str(extra_tab_name))
 
 
diff --git a/lms/djangoapps/courseware/features/navigation.py b/lms/djangoapps/courseware/features/navigation.py
index 7c2474ae1a..c87e6122a4 100644
--- a/lms/djangoapps/courseware/features/navigation.py
+++ b/lms/djangoapps/courseware/features/navigation.py
@@ -24,11 +24,11 @@ def view_course_multiple_sections(step):
                                        display_name=section_name(2))
 
     place1 = world.ItemFactory.create(parent_location=section1.location,
-                                               template='i4x://edx/templates/sequential/Empty',
+                                               category='sequential',
                                                display_name=subsection_name(1))
 
     place2 = world.ItemFactory.create(parent_location=section2.location,
-                                               template='i4x://edx/templates/sequential/Empty',
+                                               category='sequential',
                                                display_name=subsection_name(2))
 
     add_problem_to_course_section('model_course', 'multiple choice', place1.location)
@@ -46,7 +46,7 @@ def view_course_multiple_subsections(step):
                                        display_name=section_name(1))
 
     place1 = world.ItemFactory.create(parent_location=section1.location,
-                                               template='i4x://edx/templates/sequential/Empty',
+                                               category='sequential',
                                                display_name=subsection_name(1))
 
     place2 = world.ItemFactory.create(parent_location=section1.location,
@@ -66,7 +66,7 @@ def view_course_multiple_sequences(step):
                                        display_name=section_name(1))
 
     place1 = world.ItemFactory.create(parent_location=section1.location,
-                                               template='i4x://edx/templates/sequential/Empty',
+                                               category='sequential',
                                                display_name=subsection_name(1))
 
     add_problem_to_course_section('model_course', 'multiple choice', place1.location)
@@ -177,9 +177,8 @@ def add_problem_to_course_section(course, problem_type, parent_location, extraMe
     # Create a problem item using our generated XML
     # We set rerandomize=always in the metadata so that the "Reset" button
     # will appear.
-    template_name = "i4x://edx/templates/problem/Blank_Common_Problem"
     world.ItemFactory.create(parent_location=parent_location,
-                            template=template_name,
+                            category='problem',
                             display_name=str(problem_type),
                             data=problem_xml,
                             metadata=metadata)
diff --git a/lms/djangoapps/courseware/features/problems.py b/lms/djangoapps/courseware/features/problems.py
index 82bb4959a8..e0c3c004da 100644
--- a/lms/djangoapps/courseware/features/problems.py
+++ b/lms/djangoapps/courseware/features/problems.py
@@ -17,7 +17,7 @@ def view_problem_with_attempts(step, problem_type, attempts):
     i_am_registered_for_the_course(step, 'model_course')
 
     # Ensure that the course has this problem type
-    add_problem_to_course(world.scenario_dict['COURSE'].number, problem_type, {'attempts': attempts})
+    add_problem_to_course(world.scenario_dict['COURSE'].number, problem_type, {'max_attempts': attempts})
 
     # Go to the one section in the factory-created course
     # which should be loaded with the correct problem
diff --git a/lms/djangoapps/courseware/features/problems_setup.py b/lms/djangoapps/courseware/features/problems_setup.py
index 1805da55d0..6086d7fa5e 100644
--- a/lms/djangoapps/courseware/features/problems_setup.py
+++ b/lms/djangoapps/courseware/features/problems_setup.py
@@ -273,9 +273,9 @@ def add_problem_to_course(course, problem_type, extraMeta=None):
     # Create a problem item using our generated XML
     # We set rerandomize=always in the metadata so that the "Reset" button
     # will appear.
-    template_name = "i4x://edx/templates/problem/Blank_Common_Problem"
-    world.ItemFactory.create(parent_location=section_location(course),
-                            template=template_name,
+    category_name = "problem"
+    return world.ItemFactory.create(parent_location=section_location(course),
+                            category=category_name,
                             display_name=str(problem_type),
                             data=problem_xml,
                             metadata=metadata)
diff --git a/lms/djangoapps/courseware/features/video.py b/lms/djangoapps/courseware/features/video.py
index 6b05af51b5..f95ffd9917 100644
--- a/lms/djangoapps/courseware/features/video.py
+++ b/lms/djangoapps/courseware/features/video.py
@@ -43,14 +43,13 @@ def view_videoalpha(step):
 
 
 def add_video_to_course(course):
-    template_name = 'i4x://edx/templates/video/default'
     world.ItemFactory.create(parent_location=section_location(course),
-                             template=template_name,
+                             category='video',
                              display_name='Video')
 
 
 def add_videoalpha_to_course(course):
-    template_name = 'i4x://edx/templates/videoalpha/Video_Alpha'
+    category = 'videoalpha'
     world.ItemFactory.create(parent_location=section_location(course),
-                             template=template_name,
+                             category=category,
                              display_name='Video Alpha')
diff --git a/lms/djangoapps/courseware/tests/__init__.py b/lms/djangoapps/courseware/tests/__init__.py
index 0abbaa02cf..31fe376d69 100644
--- a/lms/djangoapps/courseware/tests/__init__.py
+++ b/lms/djangoapps/courseware/tests/__init__.py
@@ -29,17 +29,17 @@ class BaseTestXmodule(ModuleStoreTestCase):
         2. create, enrol and login users for this course;
 
     Any xmodule should overwrite only next parameters for test:
-        1. TEMPLATE_NAME
+        1. CATEGORY
         2. DATA
         3. MODEL_DATA
 
-    This class should not contain any tests, because TEMPLATE_NAME
+    This class should not contain any tests, because CATEGORY
     should be defined in child class.
     """
     USER_COUNT = 2
 
     # Data from YAML common/lib/xmodule/xmodule/templates/NAME/default.yaml
-    TEMPLATE_NAME = ""
+    CATEGORY = ""
     DATA = ''
     MODEL_DATA = {'data': '<some_module></some_module>'}
 
@@ -53,11 +53,11 @@ class BaseTestXmodule(ModuleStoreTestCase):
 
         chapter = ItemFactory.create(
             parent_location=self.course.location,
-            template="i4x://edx/templates/sequential/Empty",
+            category="sequential",
         )
         section = ItemFactory.create(
             parent_location=chapter.location,
-            template="i4x://edx/templates/sequential/Empty"
+            category="sequential"
         )
 
         # username = robot{0}, password = 'test'
@@ -71,7 +71,7 @@ class BaseTestXmodule(ModuleStoreTestCase):
 
         self.item_descriptor = ItemFactory.create(
             parent_location=section.location,
-            template=self.TEMPLATE_NAME,
+            category=self.CATEGORY,
             data=self.DATA
         )
 
diff --git a/lms/djangoapps/courseware/tests/test_submitting_problems.py b/lms/djangoapps/courseware/tests/test_submitting_problems.py
index 83ae7dc73e..7e9b55a4fb 100644
--- a/lms/djangoapps/courseware/tests/test_submitting_problems.py
+++ b/lms/djangoapps/courseware/tests/test_submitting_problems.py
@@ -130,7 +130,7 @@ class TestSubmittingProblems(ModuleStoreTestCase, LoginEnrollmentTestCase):
 
         problem = ItemFactory.create(
             parent_location=section_location,
-            template=problem_template,
+            category='problem',
             data=prob_xml,
             metadata={'randomize': 'always'},
             display_name=name
@@ -149,13 +149,13 @@ class TestSubmittingProblems(ModuleStoreTestCase, LoginEnrollmentTestCase):
         if not(hasattr(self, 'chapter')):
             self.chapter = ItemFactory.create(
                 parent_location=self.course.location,
-                template="i4x://edx/templates/chapter/Empty",
+                category='chapter'
             )
 
         section = ItemFactory.create(
             parent_location=self.chapter.location,
             display_name=name,
-            template="i4x://edx/templates/sequential/Empty",
+            category='sequential',
             metadata={'graded': True, 'format': section_format}
         )
 
diff --git a/lms/djangoapps/courseware/tests/test_video_mongo.py b/lms/djangoapps/courseware/tests/test_video_mongo.py
index a0fdecc77a..829308423c 100644
--- a/lms/djangoapps/courseware/tests/test_video_mongo.py
+++ b/lms/djangoapps/courseware/tests/test_video_mongo.py
@@ -7,7 +7,7 @@ from . import BaseTestXmodule
 class TestVideo(BaseTestXmodule):
     """Integration tests: web client + mongo."""
 
-    TEMPLATE_NAME = "i4x://edx/templates/video/default"
+    TEMPLATE_NAME = "video"
     DATA = '<video  youtube="0.75:JMD_ifUUfsU,1.0:OEoXaMPEzfM,1.25:AKqURZnYqpk,1.50:DYpADpL7jAY"/>'
 
     def test_handle_ajax_dispatch(self):
diff --git a/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py b/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py
index 182cbab9e7..d5afb1a78c 100644
--- a/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py
+++ b/lms/djangoapps/courseware/tests/test_videoalpha_mongo.py
@@ -9,7 +9,7 @@ from django.conf import settings
 class TestVideo(BaseTestXmodule):
     """Integration tests: web client + mongo."""
 
-    TEMPLATE_NAME = "i4x://edx/templates/videoalpha/Video_Alpha"
+    CATEGORY = "videoalpha"
     DATA = SOURCE_XML
     MODEL_DATA = {
         'data': DATA
diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index bbdf97ca9b..fbe2c05ada 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -15,10 +15,11 @@ from xmodule.modulestore.xml_importer import import_from_xml
 from xmodule.modulestore.xml import XMLModuleStore
 
 from helpers import LoginEnrollmentTestCase
-from modulestore_config import TEST_DATA_DIR,\
-    TEST_DATA_XML_MODULESTORE,\
-    TEST_DATA_MONGO_MODULESTORE,\
+from modulestore_config import TEST_DATA_DIR, \
+    TEST_DATA_XML_MODULESTORE, \
+    TEST_DATA_MONGO_MODULESTORE, \
     TEST_DATA_DRAFT_MONGO_MODULESTORE
+import xmodule
 
 
 class ActivateLoginTest(LoginEnrollmentTestCase):
@@ -50,7 +51,7 @@ class PageLoaderTestCase(LoginEnrollmentTestCase):
         """
         Choose a page in the course randomly, and assert that it loads.
         """
-       # enroll in the course before trying to access pages
+        # enroll in the course before trying to access pages
         courses = module_store.get_courses()
         self.assertEqual(len(courses), 1)
         course = courses[0]
diff --git a/lms/djangoapps/instructor/tests/test_gradebook.py b/lms/djangoapps/instructor/tests/test_gradebook.py
index 5ed0c1d1af..2677df59b2 100644
--- a/lms/djangoapps/instructor/tests/test_gradebook.py
+++ b/lms/djangoapps/instructor/tests/test_gradebook.py
@@ -34,11 +34,11 @@ class TestGradebook(ModuleStoreTestCase):
         self.course = CourseFactory.create(**kwargs)
         chapter = ItemFactory.create(
             parent_location=self.course.location,
-            template="i4x://edx/templates/sequential/Empty",
+            category="sequential",
         )
         section = ItemFactory.create(
             parent_location=chapter.location,
-            template="i4x://edx/templates/sequential/Empty",
+            category="sequential",
             metadata={'graded': True, 'format': 'Homework'}
         )
 
@@ -47,11 +47,11 @@ class TestGradebook(ModuleStoreTestCase):
         for user in self.users:
             CourseEnrollmentFactory.create(user=user, course_id=self.course.id)
 
-        for i in xrange(USER_COUNT-1):
-            template_name = "i4x://edx/templates/problem/Blank_Common_Problem"
+        for i in xrange(USER_COUNT - 1):
+            category = "problem"
             item = ItemFactory.create(
                 parent_location=section.location,
-                template=template_name,
+                category=category,
                 data=StringResponseXMLFactory().build_xml(answer='foo'),
                 metadata={'rerandomize': 'always'}
             )
diff --git a/lms/djangoapps/instructor_task/tests/test_base.py b/lms/djangoapps/instructor_task/tests/test_base.py
index 5e51b9fdeb..b67453e997 100644
--- a/lms/djangoapps/instructor_task/tests/test_base.py
+++ b/lms/djangoapps/instructor_task/tests/test_base.py
@@ -119,7 +119,7 @@ class InstructorTaskModuleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase)
 
         # add a sequence to the course to which the problems can be added
         self.problem_section = ItemFactory.create(parent_location=chapter.location,
-                                                  template='i4x://edx/templates/sequential/Empty',
+                                                  category='sequential',
                                                   display_name=TEST_SECTION_NAME)
 
     @staticmethod
@@ -169,7 +169,7 @@ class InstructorTaskModuleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase)
                         'num_responses': 2}
         problem_xml = factory.build_xml(**factory_args)
         ItemFactory.create(parent_location=self.problem_section.location,
-                           template="i4x://edx/templates/problem/Blank_Common_Problem",
+                           category="problem",
                            display_name=str(problem_url_name),
                            data=problem_xml)
 
diff --git a/lms/djangoapps/instructor_task/tests/test_integration.py b/lms/djangoapps/instructor_task/tests/test_integration.py
index 9b56663753..fb8cd44169 100644
--- a/lms/djangoapps/instructor_task/tests/test_integration.py
+++ b/lms/djangoapps/instructor_task/tests/test_integration.py
@@ -243,7 +243,7 @@ class TestRescoringTask(TestIntegrationTask):
                                         grader_payload=grader_payload,
                                         num_responses=2)
         ItemFactory.create(parent_location=self.problem_section.location,
-                           template="i4x://edx/templates/problem/Blank_Common_Problem",
+                           category="problem",
                            display_name=str(problem_url_name),
                            data=problem_xml)
 
@@ -293,7 +293,7 @@ class TestRescoringTask(TestIntegrationTask):
             # Per-student rerandomization will at least generate different seeds for different users, so
             # we get a little more test coverage.
             ItemFactory.create(parent_location=self.problem_section.location,
-                               template="i4x://edx/templates/problem/Blank_Common_Problem",
+                               category="problem",
                                display_name=str(problem_url_name),
                                data=problem_xml,
                                metadata={"rerandomize": "per_student"})
diff --git a/lms/djangoapps/open_ended_grading/tests.py b/lms/djangoapps/open_ended_grading/tests.py
index a46b4b12fe..b2529e38db 100644
--- a/lms/djangoapps/open_ended_grading/tests.py
+++ b/lms/djangoapps/open_ended_grading/tests.py
@@ -161,7 +161,7 @@ class TestPeerGradingService(LoginEnrollmentTestCase):
         self.course_id = "edX/toy/2012_Fall"
         self.toy = modulestore().get_course(self.course_id)
         location = "i4x://edX/toy/peergrading/init"
-        model_data = {'data': "<peergrading/>", 'location': location}
+        model_data = {'data': "<peergrading/>", 'location': location, 'category':'peergrading'}
         self.mock_service = peer_grading_service.MockPeerGradingService()
         self.system = ModuleSystem(
             ajax_url=location,
diff --git a/rakelib/django.rake b/rakelib/django.rake
index eeb8135d4d..53c299ac9f 100644
--- a/rakelib/django.rake
+++ b/rakelib/django.rake
@@ -111,11 +111,6 @@ namespace :cms do
     end
   end
 
-  desc "Imports all the templates from the code pack"
-  task :update_templates do
-    sh(django_admin(:cms, :dev, :update_templates))
-  end
-
   desc "Import course data within the given DATA_DIR variable"
   task :xlint do
     if ENV['DATA_DIR'] and ENV['COURSE_DIR']

From 8b5979641b95d8046da41433355452895446d6fe Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Wed, 10 Jul 2013 13:32:00 -0400
Subject: [PATCH 17/22] Change default rerandomize and showanswer

The defaults used to be rerandomize=always, showanswer=closed. This is
preserved for capa problems being imported from XML. However, for
courses, and for problems created in Studio, the default has been
changed to never/finished, to match the previous defaults used by
Studio.
---
 .../contentstore/features/problem-editor.py    |  9 ++++-----
 .../contentstore/tests/test_course_settings.py |  2 +-
 common/lib/xmodule/xmodule/capa_module.py      | 18 ++++++++++++++++--
 .../templates/problem/circuitschematic.yaml    |  2 --
 .../templates/problem/forumularesponse.yaml    |  2 --
 .../templates/problem/imageresponse.yaml       |  2 --
 .../templates/problem/multiplechoice.yaml      |  2 --
 .../templates/problem/numericalresponse.yaml   |  2 --
 .../templates/problem/optionresponse.yaml      |  2 --
 .../templates/problem/string_response.yaml     |  2 --
 .../xmodule/xmodule/tests/test_capa_module.py  | 14 +++++++-------
 lms/xmodule_namespace.py                       | 12 ++++++++++--
 12 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py
index 99b693225d..64b2ec9b5c 100644
--- a/cms/djangoapps/contentstore/features/problem-editor.py
+++ b/cms/djangoapps/contentstore/features/problem-editor.py
@@ -33,12 +33,11 @@ def i_edit_and_select_settings(step):
 def i_see_five_settings_with_values(step):
     world.verify_all_setting_entries(
         [
-            [DISPLAY_NAME, "New problem", True],
+            [DISPLAY_NAME, "Blank Common Problem", True],
             [MAXIMUM_ATTEMPTS, "", False],
             [PROBLEM_WEIGHT, "", False],
-            # Not sure why these are True other than via inspection
-            [RANDOMIZATION, "Always", True],
-            [SHOW_ANSWER, "Closed", True]
+            [RANDOMIZATION, "Never", False],
+            [SHOW_ANSWER, "Finished", False]
         ])
 
 
@@ -96,7 +95,7 @@ def my_change_to_randomization_is_persisted(step):
 def i_can_revert_to_default_for_randomization(step):
     world.revert_setting_entry(RANDOMIZATION)
     world.save_component_and_reopen(step)
-    world.verify_setting_entry(world.get_setting_entry(RANDOMIZATION), RANDOMIZATION, "Always", False)
+    world.verify_setting_entry(world.get_setting_entry(RANDOMIZATION), RANDOMIZATION, "Never", False)
 
 
 @step('I can set the weight to "(.*)"?')
diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py
index fc04ad0a58..44eb16436d 100644
--- a/cms/djangoapps/contentstore/tests/test_course_settings.py
+++ b/cms/djangoapps/contentstore/tests/test_course_settings.py
@@ -351,7 +351,7 @@ class CourseMetadataEditingTest(CourseTestCase):
         self.assertEqual(test_model['display_name'], 'Robot Super Course', "not expected value")
         self.assertIn('rerandomize', test_model, 'Missing rerandomize metadata field')
         # check for deletion effectiveness
-        self.assertEqual('closed', test_model['showanswer'], 'showanswer field still in')
+        self.assertEqual('finished', test_model['showanswer'], 'showanswer field still in')
         self.assertEqual(None, test_model['xqa_key'], 'xqa_key field still in')
 
 
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 752f0d3362..40c69e9169 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -103,7 +103,7 @@ class CapaFields(object):
         help=("Defines when to show the answer to the problem. "
               "A default value can be set in Advanced Settings."),
         scope=Scope.settings,
-        default="closed",
+        default="finished",
         values=[
             {"display_name": "Always", "value": "always"},
             {"display_name": "Answered", "value": "answered"},
@@ -123,7 +123,7 @@ class CapaFields(object):
         help="Defines how often inputs are randomized when a student loads the problem. "
              "This setting only applies to problems that can have randomly generated numeric values. "
              "A default value can be set in Advanced Settings.",
-        default="always",
+        default="never",
         scope=Scope.settings,
         values=[
             {"display_name": "Always", "value": "always"},
@@ -1112,6 +1112,20 @@ class CapaDescriptor(CapaFields, RawDescriptor):
             path[8:],
         ]
 
+    @classmethod
+    def from_xml(cls, xml_data, system, org=None, course=None):
+        """
+        Augment regular translation w/ setting the pre-Studio defaults.
+        """
+        problem = super(CapaDescriptor, cls).from_xml(xml_data, system, org, course)
+        # pylint: disable=W0212
+        if 'showanswer' not in problem._model_data:
+            problem.showanswer = "closed"
+        if 'rerandomize' not in problem._model_data:
+            problem.rerandomize = "always"
+        return problem
+
+
     @property
     def non_editable_metadata_fields(self):
         non_editable_fields = super(CapaDescriptor, self).non_editable_metadata_fields
diff --git a/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml b/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml
index 1717bb91ad..051dfe1912 100644
--- a/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml
@@ -1,8 +1,6 @@
 ---
 metadata:
     display_name: Circuit Schematic Builder
-    rerandomize: never
-    showanswer: finished
     markdown: !!null
 data: |
       <problem >
diff --git a/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml b/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml
index 4cf877bd1f..807a7833e4 100644
--- a/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml
@@ -1,8 +1,6 @@
 ---
 metadata:
     display_name: Math Expression Input
-    rerandomize: never
-    showanswer: finished
     markdown: !!null
 data: |
   <problem>
diff --git a/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml
index 566997671d..44bcc56d80 100644
--- a/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml
@@ -1,8 +1,6 @@
 ---
 metadata:
     display_name: Image Mapped Input
-    rerandomize: never
-    showanswer: finished
     markdown: !!null
 data: |
   <problem>
diff --git a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
index 202fc03b44..68845564d5 100644
--- a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
@@ -1,8 +1,6 @@
 ---
 metadata:
     display_name: Multiple Choice
-    rerandomize: never
-    showanswer: finished
     markdown: |
        A multiple choice problem presents radio buttons for student input. Students can only select a single 
        option presented. Multiple Choice questions have been the subject of many areas of research due to the early 
diff --git a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
index 9b2ddec2a7..e97a54b460 100644
--- a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml
@@ -1,8 +1,6 @@
 ---
 metadata:
     display_name: Numerical Input
-    rerandomize: never
-    showanswer: finished
     markdown: |
        A numerical input problem accepts a line of text input from the
        student, and evaluates the input for correctness based on its
diff --git a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
index 8e59f8ae4d..44af7a850a 100644
--- a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
@@ -1,8 +1,6 @@
 ---
 metadata:
     display_name: Dropdown
-    rerandomize: never
-    showanswer: finished
     markdown: |
         Dropdown problems give a limited set of options for students to respond with, and present those options
         in a format that encourages them to search for a specific answer rather than being immediately presented 
diff --git a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
index 9c59ae3bc2..cf95fe8331 100644
--- a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
@@ -1,8 +1,6 @@
 ---
 metadata:
     display_name: Text Input
-    rerandomize: never
-    showanswer: finished
     markdown: |
         A text input problem accepts a line of text from the 
         student, and evaluates the input for correctness based on an expected 
diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/common/lib/xmodule/xmodule/tests/test_capa_module.py
index 1e84174291..0f3dfa5b85 100644
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -636,10 +636,10 @@ class CapaModuleTest(unittest.TestCase):
 
         # Expect that the problem was reset
         module.new_lcp.assert_called_once_with(None)
-        module.choose_new_seed.assert_called_once_with()
 
     def test_reset_problem_closed(self):
-        module = CapaFactory.create()
+        # pre studio default
+        module = CapaFactory.create(rerandomize="always")
 
         # Simulate that the problem is closed
         with patch('xmodule.capa_module.CapaModule.closed') as mock_closed:
@@ -900,13 +900,13 @@ class CapaModuleTest(unittest.TestCase):
         module = CapaFactory.create(done=False)
         self.assertFalse(module.should_show_reset_button())
 
-        # Otherwise, DO show the reset button
-        module = CapaFactory.create(done=True)
+        # pre studio default value, DO show the reset button
+        module = CapaFactory.create(rerandomize="always", done=True)
         self.assertTrue(module.should_show_reset_button())
 
         # If survey question for capa (max_attempts = 0),
         # DO show the reset button
-        module = CapaFactory.create(max_attempts=0, done=True)
+        module = CapaFactory.create(rerandomize="always", max_attempts=0, done=True)
         self.assertTrue(module.should_show_reset_button())
 
     def test_should_show_save_button(self):
@@ -940,8 +940,8 @@ class CapaModuleTest(unittest.TestCase):
         module = CapaFactory.create(max_attempts=None, rerandomize="per_student", done=True)
         self.assertFalse(module.should_show_save_button())
 
-        # Otherwise, DO show the save button
-        module = CapaFactory.create(done=False)
+        # pre-studio default, DO show the save button
+        module = CapaFactory.create(rerandomize="always", done=False)
         self.assertTrue(module.should_show_save_button())
 
         # If we're not randomizing and we have limited attempts,  then we can save
diff --git a/lms/xmodule_namespace.py b/lms/xmodule_namespace.py
index a78e27e5af..d57ad9ce52 100644
--- a/lms/xmodule_namespace.py
+++ b/lms/xmodule_namespace.py
@@ -41,8 +41,16 @@ class LmsNamespace(Namespace):
         help="Amount of time after the due date that submissions will be accepted",
         scope=Scope.settings
     )
-    showanswer = String(help="When to show the problem answer to the student", scope=Scope.settings, default="closed")
-    rerandomize = String(help="When to rerandomize the problem", default="always", scope=Scope.settings)
+    showanswer = String(
+        help="When to show the problem answer to the student",
+        scope=Scope.settings,
+        default="finished"
+    )
+    rerandomize = String(
+        help="When to rerandomize the problem",
+        default="never",
+        scope=Scope.settings
+    )
     days_early_for_beta = Float(
         help="Number of days early to show content to beta users",
         default=None,

From 4b5347885967a9915dae9d158344200d6b194c36 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Wed, 10 Jul 2013 16:31:34 -0400
Subject: [PATCH 18/22] Require markdown to be explicitly set

---
 cms/djangoapps/contentstore/views/component.py | 5 ++---
 common/lib/xmodule/xmodule/capa_module.py      | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 13eca522dd..505a93903a 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -142,11 +142,10 @@ def edit_unit(request, location):
     for category in COMPONENT_TYPES:
         component_class = XModuleDescriptor.load_class(category)
         # add the default template
-        has_markdown = hasattr(component_class, 'markdown') and component_class.markdown is not None
         component_templates[category].append((
             component_class.display_name.default or 'Blank',
             category,
-            has_markdown,
+            False,  # No defaults have markdown (hardcoded current default)
             None  # no boilerplate for overrides
         ))
         # add boilerplates
@@ -175,7 +174,7 @@ def edit_unit(request, location):
                     component_templates['advanced'].append((
                         component_class.display_name.default or category,
                         category,
-                        hasattr(component_class, 'markdown') and component_class.markdown is not None,
+                        False,
                         None  # don't override default data
                         ))
                 except PluginMissingError:
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 40c69e9169..ef3e1999c8 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -146,7 +146,7 @@ class CapaFields(object):
         values={"min": 0, "step": .1},
         scope=Scope.settings
     )
-    markdown = String(help="Markdown source of this module", default="", scope=Scope.settings)
+    markdown = String(help="Markdown source of this module", default=None, scope=Scope.settings)
     source_code = String(
         help="Source code for LaTeX and Word problems. This feature is not well-supported.",
         scope=Scope.settings

From f6b7b2678d9e19b046df05d75ca93164640f7c29 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Wed, 10 Jul 2013 16:35:16 -0400
Subject: [PATCH 19/22] Set about page default content from overview.yml
 template

---
 cms/djangoapps/contentstore/views/course.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index 4c95d6e06e..0e16624c42 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -45,6 +45,7 @@ from .component import (
 from django_comment_common.utils import seed_permissions_roles
 import datetime
 from django.utils.timezone import UTC
+from xmodule.html_module import AboutDescriptor
 __all__ = ['course_index', 'create_new_course', 'course_info',
            'course_info_updates', 'get_course_settings',
            'course_config_graders_page',
@@ -133,9 +134,14 @@ def create_new_course(request):
     modulestore('direct').create_and_save_xmodule(dest_location, metadata=metadata)
     new_course = modulestore('direct').get_item(dest_location)
 
-    # clone a default 'about' module as well
-    dest_about_location = dest_location._replace(category='about', name='overview')
-    modulestore('direct').create_and_save_xmodule(dest_about_location, system=new_course.system)
+    # clone a default 'about' overview module as well
+    dest_about_location = dest_location.replace(category='about', name='overview')
+    overview_template = AboutDescriptor.get_template('overview.yaml')
+    modulestore('direct').create_and_save_xmodule(
+        dest_about_location,
+        system=new_course.system,
+        definition_data=overview_template.get('data')
+    )
 
     initialize_course_tabs(new_course)
 

From 0a38e490e345e4886c8d28273d6851ce77aac19b Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Wed, 10 Jul 2013 16:35:39 -0400
Subject: [PATCH 20/22] Fix pep8/pylint errors

---
 common/lib/xmodule/xmodule/combined_open_ended_module.py | 3 ++-
 common/lib/xmodule/xmodule/html_module.py                | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 60103a2126..c4215f709c 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -84,7 +84,8 @@ class CombinedOpenEndedFields(object):
     display_name = String(
         display_name="Display Name",
         help="This name appears in the horizontal navigation at the top of the page.",
-        default="Open Ended Grading", scope=Scope.settings
+        default="Open Ended Grading",
+        scope=Scope.settings
     )
     current_task_number = Integer(help="Current task that the student is on.", default=0, scope=Scope.user_state)
     task_states = List(help="List of state dictionaries of each task within this module.", scope=Scope.user_state)
diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index 2c7c9e0b01..0536f5ef5e 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -167,9 +167,9 @@ class HtmlDescriptor(HtmlFields, XmlDescriptor, EditingDescriptor):
                                                     pathname=pathname)
 
         resource_fs.makedir(os.path.dirname(filepath), recursive=True, allow_recreate=True)
-        with resource_fs.open(filepath, 'w') as file:
+        with resource_fs.open(filepath, 'w') as filestream:
             html_data = self.data.encode('utf-8')
-            file.write(html_data)
+            filestream.write(html_data)
 
         # write out the relative name
         relname = path(pathname).basename()

From 92391a22fc58d61c18b52888cdb532fdd4627fae Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Thu, 11 Jul 2013 08:42:24 -0400
Subject: [PATCH 21/22] Don't force field inheritance of default values

---
 .../xmodule/xmodule/modulestore/mongo/base.py   |  4 ----
 common/lib/xmodule/xmodule/tests/test_import.py | 17 +++--------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/base.py b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
index 0b1c601a2f..ab63243aaf 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo/base.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo/base.py
@@ -630,10 +630,6 @@ class MongoModuleStore(ModuleStoreBase):
                 definition_data = {}
         dbmodel = self._create_new_model_data(location.category, location, definition_data, metadata)
         xmodule = xblock_class(system, dbmodel)
-        # force inherited fields w/ defaults to take the defaults so the children can inherit
-        for attr in INHERITABLE_METADATA:
-            if hasattr(xmodule, attr):
-                xmodule._model_data[attr] = getattr(xmodule, attr)
         return xmodule
 
     def save_xmodule(self, xmodule):
diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py
index 30c8939b5b..2fe9d70627 100644
--- a/common/lib/xmodule/xmodule/tests/test_import.py
+++ b/common/lib/xmodule/xmodule/tests/test_import.py
@@ -156,11 +156,7 @@ class ImportTestCase(BaseCourseTestCase):
         child = descriptor.get_children()[0]
         self.assertEqual(child.lms.due, ImportTestCase.date.from_json(v))
         self.assertEqual(child._inheritable_metadata, child._inherited_metadata)
-        self.assertEqual(2, len(child._inherited_metadata))
-        self.assertLessEqual(
-            ImportTestCase.date.from_json(child._inherited_metadata['start']),
-            datetime.datetime.now(UTC())
-        )
+        self.assertEqual(1, len(child._inherited_metadata))
         self.assertEqual(v, child._inherited_metadata['due'])
 
         # Now export and check things
@@ -218,10 +214,8 @@ class ImportTestCase(BaseCourseTestCase):
         self.assertEqual(child.lms.due, None)
         # pylint: disable=W0212
         self.assertEqual(child._inheritable_metadata, child._inherited_metadata)
-        self.assertEqual(1, len(child._inherited_metadata))
-        # why do these tests look in the internal structure v just calling child.start?
         self.assertLessEqual(
-            ImportTestCase.date.from_json(child._inherited_metadata['start']),
+            child.lms.start,
             datetime.datetime.now(UTC())
         )
 
@@ -249,12 +243,7 @@ class ImportTestCase(BaseCourseTestCase):
         self.assertEqual(descriptor.lms.due, ImportTestCase.date.from_json(course_due))
         self.assertEqual(child.lms.due, ImportTestCase.date.from_json(child_due))
         # Test inherited metadata. Due does not appear here (because explicitly set on child).
-        self.assertEqual(1, len(child._inherited_metadata))
-        self.assertLessEqual(
-            ImportTestCase.date.from_json(child._inherited_metadata['start']),
-            datetime.datetime.now(UTC()))
-        # Test inheritable metadata. This has the course inheritable value for due.
-        self.assertEqual(2, len(child._inheritable_metadata))
+        self.assertEqual(1, len(child._inheritable_metadata))
         self.assertEqual(course_due, child._inheritable_metadata['due'])
 
     def test_is_pointer_tag(self):

From be4fbc562e30b9dbe745b4552047aa4a92b451e8 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Tue, 16 Jul 2013 16:00:28 -0400
Subject: [PATCH 22/22] Refactor tests to no longer use templates

Add boilerplate option to ItemFactory
Minor start date fix to not use microsecs
---
 .../contentstore/tests/test_contentstore.py   | 20 +++++++-------
 .../contentstore/tests/test_item.py           | 14 +++++-----
 .../xmodule/modulestore/tests/factories.py    | 27 +++++++++++++------
 .../tests/test_submitting_problems.py         | 24 ++++++++---------
 4 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index fa7c45cb1d..f67af41cdc 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -308,12 +308,14 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         CourseFactory.create(org='edX', course='999', display_name='Robot Super Course')
         course_location = Location(['i4x', 'edX', '999', 'course', 'Robot_Super_Course', None])
 
-        ItemFactory.create(parent_location=course_location,
-                                            template="i4x://edx/templates/static_tab/Empty",
-                                            display_name="Static_1")
-        ItemFactory.create(parent_location=course_location,
-                                            template="i4x://edx/templates/static_tab/Empty",
-                                            display_name="Static_2")
+        ItemFactory.create(
+            parent_location=course_location,
+            category="static_tab",
+            display_name="Static_1")
+        ItemFactory.create(
+            parent_location=course_location,
+            category="static_tab",
+            display_name="Static_2")
 
         course = module_store.get_item(Location(['i4x', 'edX', '999', 'course', 'Robot_Super_Course', None]))
 
@@ -370,7 +372,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         course_location = Location(['i4x', 'edX', '999', 'course', 'Robot_Super_Course', None])
 
         chapterloc = ItemFactory.create(parent_location=course_location, display_name="Chapter").location
-        ItemFactory.create(parent_location=chapterloc, template='i4x://edx/templates/sequential/Empty', display_name="Sequential")
+        ItemFactory.create(parent_location=chapterloc, category='sequential', display_name="Sequential")
 
         sequential = direct_store.get_item(Location(['i4x', 'edX', '999', 'sequential', 'Sequential', None]))
         chapter = direct_store.get_item(Location(['i4x', 'edX', '999', 'chapter', 'Chapter', None]))
@@ -650,9 +652,9 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         vertical = module_store.get_item(Location(['i4x', 'edX', 'toy',
                                          'vertical', 'vertical_test', None]), depth=1)
 
-        draft_store.clone_item(vertical.location, vertical.location)
+        draft_store.convert_to_draft(vertical.location)
         for child in vertical.get_children():
-            draft_store.clone_item(child.location, child.location)
+            draft_store.convert_to_draft(child.location)
 
         # delete the course
         delete_course(module_store, content_store, location, commit=True)
diff --git a/cms/djangoapps/contentstore/tests/test_item.py b/cms/djangoapps/contentstore/tests/test_item.py
index 2b514c0726..cd203e6af7 100644
--- a/cms/djangoapps/contentstore/tests/test_item.py
+++ b/cms/djangoapps/contentstore/tests/test_item.py
@@ -49,7 +49,7 @@ class TestCreateItem(CourseTestCase):
         resp = self.client.post(
             reverse('create_item'),
             json.dumps({
-                'parent_location': self.course_location.url(),
+                'parent_location': self.course.location.url(),
                 'display_name': display_name,
                 'category': 'chapter'
             }),
@@ -62,11 +62,11 @@ class TestCreateItem(CourseTestCase):
         new_obj = modulestore().get_item(chap_location)
         self.assertEqual(new_obj.category, 'chapter')
         self.assertEqual(new_obj.display_name, display_name)
-        self.assertEqual(new_obj.location.org, self.course_location.org)
-        self.assertEqual(new_obj.location.course, self.course_location.course)
+        self.assertEqual(new_obj.location.org, self.course.location.org)
+        self.assertEqual(new_obj.location.course, self.course.location.course)
 
         # get the course and ensure it now points to this one
-        course = modulestore().get_item(self.course_location)
+        course = modulestore().get_item(self.course.location)
         self.assertIn(chap_location, course.children)
 
         # use default display name
@@ -112,7 +112,7 @@ class TestCreateItem(CourseTestCase):
         resp = self.client.post(
             reverse('create_item'),
             json.dumps(
-                {'parent_location': self.course_location.url(),
+                {'parent_location': self.course.location.url(),
                  'category': 'problem',
                  'boilerplate': 'nosuchboilerplate.yaml'
                  }),
@@ -140,7 +140,7 @@ class TestEditItem(CourseTestCase):
         resp = self.client.post(
             reverse('create_item'),
             json.dumps(
-                {'parent_location': self.course_location.url(),
+                {'parent_location': self.course.location.url(),
                  'display_name': display_name,
                  'category': 'chapter'
                  }),
@@ -209,4 +209,4 @@ class TestEditItem(CourseTestCase):
             content_type="application/json"
         )
         problem = modulestore('draft').get_item(self.problems[0])
-        self.assertIsNo/ne(problem.markdown)
+        self.assertIsNone(problem.markdown)
diff --git a/common/lib/xmodule/xmodule/modulestore/tests/factories.py b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
index 9a0c87ff97..be705149f3 100644
--- a/common/lib/xmodule/xmodule/modulestore/tests/factories.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/factories.py
@@ -8,6 +8,7 @@ from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
 from xmodule.course_module import CourseDescriptor
 from xblock.core import Scope
+from xmodule.x_module import XModuleDescriptor
 
 class XModuleCourseFactory(Factory):
     """
@@ -36,7 +37,7 @@ class XModuleCourseFactory(Factory):
         if display_name is not None:
             new_course.display_name = display_name
 
-        new_course.lms.start = datetime.datetime.now(UTC)
+        new_course.lms.start = datetime.datetime.now(UTC).replace(microsecond=0)
         new_course.tabs = kwargs.pop(
             'tabs',
             [
@@ -88,21 +89,23 @@ class XModuleItemFactory(Factory):
     @classmethod
     def _create(cls, target_class, **kwargs):
         """
-        Uses *kwargs*:
+        Uses ``**kwargs``:
 
-        *parent_location* (required): the location of the parent module
+        :parent_location: (required): the location of the parent module
             (e.g. the parent course or section)
 
-        category: the category of the resulting item.
+        :category: the category of the resulting item.
 
-        *data* (optional): the data for the item
+        :data: (optional): the data for the item
             (e.g. XML problem definition for a problem item)
 
-        *display_name* (optional): the display name of the item
+        :display_name: (optional): the display name of the item
 
-        *metadata* (optional): dictionary of metadata attributes
+        :metadata: (optional): dictionary of metadata attributes
 
-        *target_class* is ignored
+        :boilerplate: (optional) the boilerplate for overriding field values
+
+        :target_class: is ignored
         """
 
         DETACHED_CATEGORIES = ['about', 'static_tab', 'course_info']
@@ -115,6 +118,14 @@ class XModuleItemFactory(Factory):
         metadata = kwargs.get('metadata', {})
         location = kwargs.get('location', XModuleItemFactory.location(parent_location, category, display_name))
         assert location != parent_location
+        if kwargs.get('boilerplate') is not None:
+            template_id = kwargs.get('boilerplate')
+            clz = XModuleDescriptor.load_class(category)
+            template = clz.get_template(template_id)
+            assert template is not None
+            metadata.update(template.get('metadata', {}))
+            if not isinstance(data, basestring):
+                data.update(template.get('data'))
 
         store = modulestore('direct')
 
diff --git a/lms/djangoapps/courseware/tests/test_submitting_problems.py b/lms/djangoapps/courseware/tests/test_submitting_problems.py
index 7e9b55a4fb..0ed37cdd5c 100644
--- a/lms/djangoapps/courseware/tests/test_submitting_problems.py
+++ b/lms/djangoapps/courseware/tests/test_submitting_problems.py
@@ -59,7 +59,7 @@ class TestSubmittingProblems(ModuleStoreTestCase, LoginEnrollmentTestCase):
         Returns the url of the problem given the problem's name
         """
 
-        return "i4x://"+self.course.org+"/{}/problem/{}".format(self.COURSE_SLUG, problem_url_name)
+        return "i4x://" + self.course.org + "/{}/problem/{}".format(self.COURSE_SLUG, problem_url_name)
 
     def modx_url(self, problem_location, dispatch):
         """
@@ -119,7 +119,6 @@ class TestSubmittingProblems(ModuleStoreTestCase, LoginEnrollmentTestCase):
         num_input: the number of input fields to create in the problem
         """
 
-        problem_template = "i4x://edx/templates/problem/Blank_Common_Problem"
         prob_xml = OptionResponseXMLFactory().build_xml(
             question_text='The correct answer is Correct',
             num_inputs=num_inputs,
@@ -405,7 +404,7 @@ class TestCourseGrader(TestSubmittingProblems):
         # Get both parts correct
         self.submit_question_answer('H1P1', {'2_1': 'Correct', '2_2': 'Correct'})
         self.check_grade_percent(0.25)
-        self.assertEqual(self.earned_hw_scores(), [2.0])   # Order matters
+        self.assertEqual(self.earned_hw_scores(), [2.0])  # Order matters
         self.assertEqual(self.score_for_hw('homework'), [2.0])
 
     def test_weighted_exam(self):
@@ -443,7 +442,7 @@ class TestCourseGrader(TestSubmittingProblems):
 
         self.assertEqual(self.score_for_hw('homework1'), [1.0, 0.0])
         self.assertEqual(self.score_for_hw('homework2'), [1.0, 1.0])
-        self.assertEqual(self.earned_hw_scores(), [1.0, 2.0, 0])   # Order matters
+        self.assertEqual(self.earned_hw_scores(), [1.0, 2.0, 0])  # Order matters
         self.check_grade_percent(0.75)
 
     def test_dropping_nochange(self):
@@ -457,7 +456,7 @@ class TestCourseGrader(TestSubmittingProblems):
         self.assertEqual(self.score_for_hw('homework1'), [1.0, 0.0])
         self.assertEqual(self.score_for_hw('homework2'), [1.0, 1.0])
         self.assertEqual(self.score_for_hw('homework3'), [1.0, 0.0])
-        self.assertEqual(self.earned_hw_scores(), [1.0, 2.0, 1.0])   # Order matters
+        self.assertEqual(self.earned_hw_scores(), [1.0, 2.0, 1.0])  # Order matters
         self.check_grade_percent(0.75)
 
     def test_dropping_all_correct(self):
@@ -471,7 +470,7 @@ class TestCourseGrader(TestSubmittingProblems):
             self.submit_question_answer(name, {'2_1': 'Correct'})
 
         self.check_grade_percent(1.0)
-        self.assertEqual(self.earned_hw_scores(), [1.0, 2.0, 2.0])   # Order matters
+        self.assertEqual(self.earned_hw_scores(), [1.0, 2.0, 2.0])  # Order matters
         self.assertEqual(self.score_for_hw('homework3'), [1.0, 1.0])
 
 
@@ -579,13 +578,13 @@ class TestPythonGradedResponse(TestSubmittingProblems):
         set up an example Circuit_Schematic_Builder problem
         """
 
-        schematic_template = "i4x://edx/templates/problem/Circuit_Schematic_Builder"
         script = self.SCHEMATIC_SCRIPT
 
         xmldata = SchematicResponseXMLFactory().build_xml(answer=script)
         ItemFactory.create(
             parent_location=self.section.location,
-            template=schematic_template,
+            category='problem',
+            boilerplate='circuitschematic.yaml',
             display_name=name,
             data=xmldata
         )
@@ -602,14 +601,14 @@ class TestPythonGradedResponse(TestSubmittingProblems):
         set up an example custom response problem using a check function
         """
 
-        custom_template = "i4x://edx/templates/problem/Custom_Python-Evaluated_Input"
         test_csv = self.CUSTOM_RESPONSE_SCRIPT
         expect = self.CUSTOM_RESPONSE_CORRECT
         cfn_problem_xml = CustomResponseXMLFactory().build_xml(script=test_csv, cfn='test_csv', expect=expect)
 
         ItemFactory.create(
             parent_location=self.section.location,
-            template=custom_template,
+            category='problem',
+            boilerplate='customgrader.yaml',
             data=cfn_problem_xml,
             display_name=name
         )
@@ -628,13 +627,12 @@ class TestPythonGradedResponse(TestSubmittingProblems):
 
         script = self.COMPUTED_ANSWER_SCRIPT
 
-        custom_template = "i4x://edx/templates/problem/Custom_Python-Evaluated_Input"
-
         computed_xml = CustomResponseXMLFactory().build_xml(answer=script)
 
         ItemFactory.create(
             parent_location=self.section.location,
-            template=custom_template,
+            category='problem',
+            boilerplate='customgrader.yaml',
             data=computed_xml,
             display_name=name
         )