diff --git a/common/lib/xmodule/xmodule/combined_open_ended_module.py b/common/lib/xmodule/xmodule/combined_open_ended_module.py
index 46f912a8de..5eec8f34fd 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_module.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_module.py
@@ -124,6 +124,20 @@ class CombinedOpenEndedModule(XModule):
         return True
 
     def get_html(self):
+        task_html=self.get_html_base()
+        #set context variables and render template
+
+        context = {
+            'items': [{'content' : task_html}],
+            'ajax_url': self.system.ajax_url,
+            'allow_reset': True,
+            }
+
+        html = system.render_template('combined_open_ended.html', context)
+        return html
+
+
+    def get_html_base(self):
         self.update_task_states()
         html = self.current_task.get_html(self.system)
         return_html = rewrite_links(html, self.rewrite_content_links)
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/combinedopenended.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/combinedopenended.coffee
new file mode 100644
index 0000000000..6e286544a5
--- /dev/null
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/combinedopenended.coffee
@@ -0,0 +1,23 @@
+class @CombinedOpenEnded
+  constructor: (element) ->
+    @el = $(element).find('section.combined-open-ended')
+    @ajax_url = @el.data('ajax-url')
+    @reset_button = @$('.reset-button')
+    @reset_button.click @reset
+
+  reset: (event) =>
+  event.preventDefault()
+  if @state == 'done'
+    $.postWithPrefix "#{@ajax_url}/reset", {}, (response) =>
+      if response.success
+        @answer_area.val('')
+        @rubric_wrapper.html('')
+        @hint_wrapper.html('')
+        @message_wrapper.html('')
+        @state = 'initial'
+        @rebind()
+        @reset_button.hide()
+      else
+        @errors_area.html(response.error)
+  else
+    @errors_area.html('Problem state got out of sync.  Try reloading the page.')
\ No newline at end of file
diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/common/lib/xmodule/xmodule/js/src/openended/display.coffee b/common/lib/xmodule/xmodule/js/src/openended/display.coffee
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
deleted file mode 100644
index 8b13789179..0000000000
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
new file mode 100644
index 0000000000..3d4a69e0be
--- /dev/null
+++ b/lms/templates/combined_open_ended.html
@@ -0,0 +1,9 @@
+<div id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}">
+
+    % for item in items:
+    <div class="item">${item['content'] | h}</div>
+    % endfor
+
+    <input type="button" value="Reset" class="reset-button" name="reset"/>
+</div>
+