diff --git a/src/views/modals/asset-upload.php b/src/views/modals/asset-upload.php
new file mode 100644
index 00000000..11b75218
--- /dev/null
+++ b/src/views/modals/asset-upload.php
@@ -0,0 +1,35 @@
+<!--
+********************************************************************
+*
+* Setup a modal window for the asset handler demo
+*
+********************************************************************
+-->
+<div class="modal fade img-upload">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">Image gallery</h4>
+            </div>
+            <div class="modal-body">
+                <p>Please chose an image in the gallery.</p>
+                <div class="gallery-wrapper">
+                    <p class="asset-img-gallery">
+                        <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/e/ed/Thomas_Watling_-_A_Direct_North_General_View_of_Sydney_Cove%2C_1794.jpg/220px-Thomas_Watling_-_A_Direct_North_General_View_of_Sydney_Cove%2C_1794.jpg" data-img="http://upload.wikimedia.org/wikipedia/commons/thumb/e/ed/Thomas_Watling_-_A_Direct_North_General_View_of_Sydney_Cove%2C_1794.jpg/800px-Thomas_Watling_-_A_Direct_North_General_View_of_Sydney_Cove%2C_1794.jpg">
+                        <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/5/5f/Sydney_1932.jpg/220px-Sydney_1932.jpg" data-img="http://upload.wikimedia.org/wikipedia/commons/5/5f/Sydney_1932.jpg">
+                        <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/2/27/City_of_sydney_from_the_balmain_wharf_dusk_cropped2.jpg/220px-City_of_sydney_from_the_balmain_wharf_dusk_cropped2.jpg" data-img="http://upload.wikimedia.org/wikipedia/commons/thumb/2/27/City_of_sydney_from_the_balmain_wharf_dusk_cropped2.jpg/800px-City_of_sydney_from_the_balmain_wharf_dusk_cropped2.jpg">
+                        <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/c/c3/NRL_Grand_Final_2006.JPG/220px-NRL_Grand_Final_2006.JPG" data-img="http://upload.wikimedia.org/wikipedia/commons/c/c3/NRL_Grand_Final_2006.JPG">
+                        <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/c/cd/QantasSYD.jpg/220px-QantasSYD.jpg" data-img="http://upload.wikimedia.org/wikipedia/commons/thumb/c/cd/QantasSYD.jpg/800px-QantasSYD.jpg">
+                        <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/9/9b/Trams_on_George_Street_in_front_of_the_QVB.jpg/220px-Trams_on_George_Street_in_front_of_the_QVB.jpg" data-img="http://upload.wikimedia.org/wikipedia/commons/9/9b/Trams_on_George_Street_in_front_of_the_QVB.jpg">
+                        <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/c/c4/Qvbsyd.jpg/220px-Qvbsyd.jpg" data-img="http://upload.wikimedia.org/wikipedia/commons/c/c4/Qvbsyd.jpg">
+                        <img src="http://upload.wikimedia.org/wikipedia/commons/thumb/d/d0/QVB.jpg/113px-QVB.jpg" data-img="http://upload.wikimedia.org/wikipedia/en/5/5f/QVB136lg.jpg">
+                    </p>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/views/modals/itemsinline.php b/src/views/modals/items-inline.php
similarity index 100%
rename from src/views/modals/itemsinline.php
rename to src/views/modals/items-inline.php
diff --git a/www/authorapi.php b/www/authorapi.php
index cab6d6bc..ff343778 100644
--- a/www/authorapi.php
+++ b/www/authorapi.php
@@ -148,7 +148,7 @@
 * packet. The response is the HTML of a modal window with the
 * Items API initialised to render whatever was found in the content
 * editor window (if anything).
-* See ./src/views/modals/itemsinline.php
+* See ./src/views/modals/items-inline.php
 *
 ********************************************************************
 -->
@@ -170,7 +170,7 @@
     function signItemsRequest() {
         var data = {
             item_references: [],
-            sign_type: 'itemsinline',
+            sign_type: 'items-inline',
             content: editor.getValue()
         };
         $(data.content).each(function() {
diff --git a/www/itemsapi_assess.php b/www/itemsapi_assess.php
index e24d6eb8..ece1406d 100644
--- a/www/itemsapi_assess.php
+++ b/www/itemsapi_assess.php
@@ -16,7 +16,7 @@
     'name'           => 'Items API demo - assess activity',
     'rendering_type' => 'assess',
     'state'          => 'initial',
-    'type'           => 'local_practice',
+    'type'           => 'submit_practice',
     'course_id'      => $courseid,
     'session_id'     => UUID::generateUuid(),
     'user_id'        => $studentid,
@@ -41,7 +41,7 @@
             'transition_speed'       => 400
         ),
         'time' => array(
-            'max_time'     => 120,
+            'max_time'     => 10,
             'limit_type'   => 'soft',
             'show_pause'   => true,
             'warning_time' => 60,
diff --git a/www/questioneditorapi.php b/www/questioneditorapi.php
index 19a83342..4539435d 100644
--- a/www/questioneditorapi.php
+++ b/www/questioneditorapi.php
@@ -19,25 +19,324 @@
     </div>
 </div>
 
+<!--
+********************************************************************
+*
+* Nav for different Question Editor API examples
+*
+********************************************************************
+-->
+<div class="alert alert-info" id="example-description"></div>
+<ul class="nav nav-tabs" id="nav-questioneditor">
+    <li class="dropdown">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">New Question<b class="caret"></b></a>
+        <ul class="dropdown-menu">
+            <li><a href="#" data-type="newQuestion" id="newQuestion">Standard</a></li>
+            <li><a href="#" data-type="defaults">with defaults</a></li>
+            <li><a href="#" data-type="disabled">with certain attributes disabled</a></li>
+            <li><a href="#" data-type="defaultsdisabled">with certain attributes disabled and defaults</a></li>
+            <li><a href="#" data-type="assetuploadexample">with image gallery asset handler</a></li>
+        </ul>
+    </li>
+    <li><a href="#" data-type="edit">Edit Existing Question</a></li>
+    <li><a href="#" data-type="feedback">Rubric Feedback</a></li>
+    <li><a href="#" data-type="features">Stimulus Features</a></li>
+</ul>
+
 <!-- Container for the question editor api to load into -->
 <span class="learnosity-response-editor"></span>
-<script src="http://responseeditor.learnosity.com/"></script>
+<script src="http://questioneditor.learnosity.com/"></script>
 <script>
-    LearnosityResponseEditor.init({
-        widgetType: 'response',
-        ui: {
-            columns: [{
-                tabs: ["edit", "advanced"],
-                width: "50%"
-            }, {
-                tabs: ["preview", "layout"],
-                width: "50%"
-            }],
-            fixedPreview: {
-               marginTop: 50
+    /********************************************************************
+    *
+    * Set the different initialisation settings based off the
+    * example currently being requested
+    *
+    ********************************************************************/
+    var initType,
+        initObjects = {
+            newQuestion: {
+                description: 'Just the standard default editor with no defaults set or attributes disabled.',
+                json: {
+                    configuration: {
+                        questionsApiVersion: "v2"
+                    },
+                    widgetType: 'response',
+                    ui: {
+                        columns: [
+                            {
+                                tabs: ["edit", "advanced"],
+                                width: "50%"
+                            },
+                            {
+                                tabs: ["preview", "layout"],
+                                width: "50%"
+                            }
+                        ],
+                        fixedPreview: {
+                           marginTop: 50
+                        }
+                    }
+                }
+            },
+            defaults: {
+                description: 'In this example we\'re defaulting the editor to allow '
+                    + 'editing of only one question type. We\'re also setting certain '
+                    + 'attributes before the author sees it, like <em>instant_feedback</em> '
+                    + 'being set to true, a default <em>Stimulus</em> being set etc.',
+                json: {
+                    configuration: {
+                        questionsApiVersion: "v2"
+                    },
+                    question_types: {
+                        association: {
+                            defaults: {
+                                "type": "association",
+                                "feedback_attempts": 5,
+                                "instant_feedback": true,
+                                "stimulus": "<p>Question stimulus goes here.</p>",
+                                "validation": {
+                                    "partial_scoring": true,
+                                    "penalty_score": -0.5,
+                                    "valid_score": 1
+                                    }
+                            }
+                        }
+                    },
+                    widgetType: 'response'
+                }
+            },
+            disabled: {
+                description: 'In this example we\'re hiding certain '
+                + 'attributes to demonstrate the flexibility you can provide to authors.',
+                json: {
+                    configuration: {
+                        questionsApiVersion: "v2"
+                    },
+                    question_types: {
+                        clozetext: {
+                            hidden: [
+                                "character_map", "description", "feedback_attempts",
+                                "instant_feedback", "is_math", "max_length",
+                                "metadata", "response_container", "spellcheck", "stimulus_review"
+                            ]
+                        }
+                    },
+                    widgetType: 'response'
+                }
+            },
+            defaultsdisabled: {
+                description: 'In this example we\'re defaulting the editor to allow '
+                + 'editing of only one question type. We\'re also hiding certain '
+                + 'attributes to demonstrate the flexibility you can provide to authors.',
+                json: {
+                    configuration: {
+                        questionsApiVersion: "v2"
+                    },
+                    question_types: {
+                        clozeassociation: {
+                            hidden: [ "description", "feedback_attempts", "instant_feedback",
+                                "is_math", "max_length", "metadata", "response_container",
+                                "spellcheck", "stimulus_review"
+                            ],
+                            defaults : {
+                                possible_responses: ["Answer 1", "Answer 2"],
+                                template: "<p>Here is a nice template of a Close Text question. It is nice and "
+                                    + "easy to put a {{response}} in.</p><p>Here is another {{response}} container.</p>"
+                            }
+                        }
+                    },
+                    widgetType: 'response'
+                }
+            },
+            assetuploadexample: {
+                description: 'Example of the custom asset uploader.',
+                json: {
+                    configuration: {
+                        questionsApiVersion: "v2"
+                    },
+                    widgetType: 'response',
+                    question_types: {
+                        imageclozeassociation: {
+                            defaults: {
+                                img_src: "http://upload.wikimedia.org/wikipedia/commons/5/5f/Sydney_1932.jpg",
+                                possible_responses: ["North Sydney", "Harbour Bridge", "The Rocks", "Darling Harbour"],
+                                response_positions: [
+                                    {
+                                        x: 20,
+                                        y: 69.56
+                                    },
+                                    {
+                                        x: 16.49,
+                                        y: 46.37
+                                    },
+                                    {
+                                        x: 51.23,
+                                        y: 21.55
+                                    },
+                                    {
+                                        x: 63.16,
+                                        y: 45.2
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    assetRequest: function(mediaRequested, returnType, callback) {
+                        if (mediaRequested === 'image') {
+                            var $modal = $('.modal.img-upload'),
+                                $images = $('.asset-img-gallery img'),
+                                imgClickHandler = function () {
+                                    callback($(this).data('img'));
+                                    $modal.modal('hide');
+                                };
+                            $images.on('click', imgClickHandler);
+                            $modal.modal({
+                                backdrop: 'static'
+                            }).on('hide', function () {
+                                $images.off('click', imgClickHandler);
+                            });
+                        }
+                    },
+                    ui: {
+                        columns: [
+                            {
+                                tabs: ["edit", "advanced"],
+                                width: "50%"
+                            },
+                            {
+                                tabs: ["preview", "layout"],
+                                width: "50%"
+                            }
+                        ],
+                        fixedPreview: {
+                            marginTop: 45
+                        }
+                    }
+                }
+            },
+            edit: {
+                description: 'In this example we\'re editing a previously created question.',
+                json: {
+                    configuration: {
+                        questionsApiVersion: "v2"
+                    },
+                    question_types : ["imageclozeassociation"],
+                    widget_json: {
+                        "type": "imageclozeassociation",
+                        "img_src": "http://www.learnosity.com/static/img/Blank_US_Map.png",
+                        "possible_responses": ["Oregon", "California", "Texas", "Florida"],
+                        "response_positions": [
+                            {
+                                "x": 71.25,
+                                "y": 79.88
+                            }, {
+                                "x": 0,
+                                "y": 15.68
+                            }, {
+                                "x": 35.53,
+                                "y": 70.41
+                            }, {
+                                "x": 0,
+                                "y": 44.08
+                            }
+                        ],
+                        "validation": {
+                            "partial_scoring": true,
+                            "penalty_score": -0.5,
+                            "valid_responses": [
+                                ["Florida"],
+                                ["Oregon"],
+                                ["Texas"],
+                                ["California"]
+                            ],
+                            "valid_score": 1
+                        }
+                    },
+                    widgetType: 'response'
+                }
+            },
+            feedback: {
+                description: 'For teacher and grader feedback/rubrics. Default '
+                    + 'editor with an existing rating feedback type.',
+                json: {
+                    configuration: {
+                        questionsApiVersion: "v2"
+                    },
+                    widget_json: {
+                        "options": [
+                            {
+                                "value": "1",
+                                "label": "25%",
+                                "label_tooltip": "Unsatifactory",
+                                "tint": "red",
+                                "description": "Poor effort."
+                            },
+                            {
+                                "value": "2",
+                                "label": "50%",
+                                "label_tooltip": "Average",
+                                "tint": "orange",
+                                "description": "You only just passed, more effort is required."
+                            },
+                            {
+                                "value": "3",
+                                "label": "75%",
+                                "label_tooltip": "Credit",
+                                "tint": "blue",
+                                "description": "You responded well to all questions."
+                            },
+                            {
+                                "value": "4",
+                                "label": "100%",
+                                "label_tooltip": "Perfect",
+                                "tint": "green",
+                                "description": "You answered everything correctly!"
+                            }
+                        ],
+                        "type": "rating"
+                    },
+                    widget_type: 'feedback'
+                }
+            },
+            features: {
+                description: 'Stimulus Features like Audio and Video. Default '
+                    + 'editor with an existing video feature.',
+                json: {
+                    configuration: {
+                        questionsApiVersion: "v2"
+                    },
+                    widget_json: {
+                        "src": "http://www.youtube.com/watch?feature=player_detailpage&amp;v=flL7M36QszA",
+                        "type": "videoplayer"
+                    },
+                    widget_type: 'feature'
+                }
             }
+        };
+
+    function changeExample(evt) {
+        var type = $(this).attr('data-type');
+        evt.preventDefault();
+        $('#nav-questioneditor').find('li').removeClass('active');
+        if ($(this).closest('ul').hasClass('dropdown-menu')) {
+            $(this).closest('li.dropdown').addClass('active');
+        } else {
+            $(this).parent().addClass('active');
+        }
+        if (typeof type !== 'undefined') {
+            currentType = initObjects[type];
+            $('#example-description').html(currentType.description);
+            LearnosityResponseEditor.init(currentType.json);
         }
-    });
+    }
+
+    (function($) {
+        $('#nav-questioneditor').find('a').on('click', changeExample);
+        $('#newQuestion').trigger('click');
+    }(jQuery));
 </script>
 
-<?php include_once '../src/includes/footer.php';
+<?php
+    include_once '../src/views/modals/asset-upload.php';
+    include_once '../src/includes/footer.php';
diff --git a/www/static/css/main.css b/www/static/css/main.css
index 06bae80e..632d59e1 100644
--- a/www/static/css/main.css
+++ b/www/static/css/main.css
@@ -1,3 +1,8 @@
+/********************************************************************
+*
+* Defaults
+*
+********************************************************************/
 html, body {
     overflow: visible !important;
 }
@@ -16,6 +21,33 @@ a:hover {
     text-decoration: inherit !important;
 }
 
+@font-face {
+    font-family: 'museo300';
+    src: url('../fonts/museo300-regular-webfont.eot');
+    src: url('../fonts/museo300-regular-webfont.eot?#iefix') format('embedded-opentype'),  url('../fonts/museo300-regular-webfont.woff') format('woff'),  url('../fonts/museo300-regular-webfont.ttf') format('truetype'),  url('../fonts/museo300-regular-webfont.svg#museo300') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'museo500';
+    src: url('../fonts/museo500-regular-webfont.eot');
+    src: url('../fonts/museo500-regular-webfont.eot?#iefix') format('embedded-opentype'),  url('../fonts/museo500-regular-webfont.woff') format('woff'),  url('../fonts/museo500-regular-webfont.ttf') format('truetype'),  url('../fonts/museo500-regular-webfont.svg#museo500') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'museo700';
+    src: url('../fonts/museo700-regular-webfont.eot');
+    src: url('../fonts/museo700-regular-webfont.eot?#iefix') format('embedded-opentype'),  url('../fonts/museo700-regular-webfont.woff') format('woff'),  url('../fonts/museo700-regular-webfont.ttf') format('truetype'),  url('../fonts/museo700-regular-webfont.svg#museo700') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+
+/********************************************************************
+*
+* Something is messing up bootstrap styles, force them to inherit
+*
+********************************************************************/
 .lrn-auth input[type="text"] {
     height: inherit !important;
 }
@@ -48,33 +80,16 @@ td {
     border-top: 1px solid #ddd !important;
 }
 
-@font-face {
-    font-family: 'museo300';
-    src: url('../fonts/museo300-regular-webfont.eot');
-    src: url('../fonts/museo300-regular-webfont.eot?#iefix') format('embedded-opentype'),  url('../fonts/museo300-regular-webfont.woff') format('woff'),  url('../fonts/museo300-regular-webfont.ttf') format('truetype'),  url('../fonts/museo300-regular-webfont.svg#museo300') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'museo500';
-    src: url('../fonts/museo500-regular-webfont.eot');
-    src: url('../fonts/museo500-regular-webfont.eot?#iefix') format('embedded-opentype'),  url('../fonts/museo500-regular-webfont.woff') format('woff'),  url('../fonts/museo500-regular-webfont.ttf') format('truetype'),  url('../fonts/museo500-regular-webfont.svg#museo500') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-@font-face {
-    font-family: 'museo700';
-    src: url('../fonts/museo700-regular-webfont.eot');
-    src: url('../fonts/museo700-regular-webfont.eot?#iefix') format('embedded-opentype'),  url('../fonts/museo700-regular-webfont.woff') format('woff'),  url('../fonts/museo700-regular-webfont.ttf') format('truetype'),  url('../fonts/museo700-regular-webfont.svg#museo700') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
 .logo {
     background: url('../images/logo-square.png') no-repeat center left;
     padding-left: 40px;
 }
 
+/********************************************************************
+*
+* Reports API section
+*
+********************************************************************/
 .slides {
     width: 100% !important;
 }
@@ -126,6 +141,11 @@ td {
    }
 }
 
+/********************************************************************
+*
+* Initialisation preview
+*
+********************************************************************/
 #initialisation-preview pre {
    background-color: ghostwhite;
    border: 1px solid silver;
@@ -144,3 +164,20 @@ td {
 #initialisation-preview .json-string {
    color: olive;
 }
+
+/********************************************************************
+*
+* Question Editor API
+*
+********************************************************************/
+.asset-img-gallery img {
+  cursor: pointer;
+  max-height: 88px;
+  display: inline-block;
+  margin-top: 5px
+}
+.gallery-wrapper {
+  overflow-y: scroll;
+  min-height: 250px;
+  max-height: 250px;
+}