From 23a242104b3bbc7badae08c3069f2c3657e1efe3 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Fri, 5 Jun 2015 12:05:23 -0700
Subject: [PATCH 01/28] start work on jquery curriculum

---
 app.js                                        |  2 +-
 .../future-jquery-ajax-json.json              | 40 ++++++++++++++-----
 views/layout.jade                             |  1 -
 3 files changed, 32 insertions(+), 11 deletions(-)
 rename seed_data/{ => challenges}/future-jquery-ajax-json.json (72%)

diff --git a/app.js b/app.js
index 6ec67f2611..5d20a43d7e 100755
--- a/app.js
+++ b/app.js
@@ -622,7 +622,7 @@ app.get(
   }
 );
 
-// put this route last
+// put ths route last
 app.get(
   '/:username',
   userController.returnUser
diff --git a/seed_data/future-jquery-ajax-json.json b/seed_data/challenges/future-jquery-ajax-json.json
similarity index 72%
rename from seed_data/future-jquery-ajax-json.json
rename to seed_data/challenges/future-jquery-ajax-json.json
index 4ceea2fafc..e197f8e3d8 100644
--- a/seed_data/future-jquery-ajax-json.json
+++ b/seed_data/challenges/future-jquery-ajax-json.json
@@ -7,19 +7,41 @@
       "name": "Waypoint: Learn how Script Tags and Document Ready Work",
       "difficulty": 0.072,
       "description": [
-        "Test"
+        "We've simplified our Cat Photo App and removed our <code>style</code> element. Add a <code>script</code> element to your page and create a <code>$(document).ready</code> function within it.",
+        "Add <code>$(document).ready(function() {</code> to your <code>script</code> element, and then close it on the following line with <code>});</code>."
       ],
       "tests": [
-        "assert(typeof $('#target').attr('disabled') === 'undefined', 'Change the disabled attribute of the \"target\" button to false');",
-        "expect($('#target')).to.exist()"
+        "assert(editor.match(/<script>/g), 'Create a <code>script</code> element.')",
+        "assert(editor.match(/<\\/script>/g) && editor.match(/<script/g) && editor.match(/<\\/script>/g).length === editor.match(/<script/g).length, 'Make sure your <code>script</code> element has a closing tag.')",
+        "assert(editor.match(/\\$\\(document\\)\\.ready\\(function\\(\\)\\s?\\{/g), 'Add <code>$(document).ready(function() {</code> to the beginning of your <code>script</code> element.')",
+        "assert(editor.match(/\\n\\s+?\\}\\);/g), 'Close your <code>$(document).ready(function() {</code> function with <code>\\}\\);</code>.')"
       ],
       "challengeSeed": [
-        "fccss",
-        "  $(document).ready(function() {",
-        "    $('#target').attr('disabled', true)",
-        "  });",
-        "fcces",
-        "<button id='target' class='btn btn-primary btn-block'>Enable this button with jQuery</button>"
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
diff --git a/views/layout.jade b/views/layout.jade
index 42aae49294..146b475a53 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -3,7 +3,6 @@ html(ng-app='profileValidation', lang='en')
   head
     include partials/universal-head
   body.top-and-bottom-margins
-    include partials/css-cdns
     include partials/navbar
     .container
       include partials/flash

From 1b1dc0ca4dc6f99d22637a8c6087021836408017 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sat, 6 Jun 2015 11:57:40 -0700
Subject: [PATCH 02/28] add additional jquery challengeSeed and tests

---
 .../challenges/future-jquery-ajax-json.json   | 180 +++++++++++++++++-
 1 file changed, 173 insertions(+), 7 deletions(-)

diff --git a/seed_data/challenges/future-jquery-ajax-json.json b/seed_data/challenges/future-jquery-ajax-json.json
index e197f8e3d8..d82aba2915 100644
--- a/seed_data/challenges/future-jquery-ajax-json.json
+++ b/seed_data/challenges/future-jquery-ajax-json.json
@@ -47,23 +47,52 @@
     },
 
     {
-      "_id": "bad87fee1348bd9aedc08826",
+      "_id": "bad87fee1348bd9bedc08826",
       "name": "Waypoint: Target Elements by Selectors Using jQuery",
       "difficulty": 0.073,
       "description": [
-
+        "Make all <code>img</code> elements bounce $('img').addClass('animated bounce')"
       ],
       "tests": [
 
       ],
       "challengeSeed": [
-
+        "fccss",
+        "  $(document).ready(function() {",
+        "",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
 
     {
-      "_id": "bad87fee1348bd9aedb08826",
+      "_id": "bad87fee1348bd9aedc08826",
       "name": "Waypoint: Target Elements by Class Using jQuery",
       "difficulty": 0.074,
       "description": [
@@ -73,14 +102,90 @@
 
       ],
       "challengeSeed": [
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('img').addClass('animated bounce');",
+        "    $('.btn').addClass('animated shake');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
+      ],
+      "challengeType": 0
+    },
 
+    {
+      "_id": "bad87fee1348bd9aedb08826",
+      "name": "Waypoint: Add an ID to an Element",
+      "difficulty": 0.075,
+      "description": [
+
+      ],
+      "tests": [
+        "assert($('form').attr('id') === 'cat-photo-form', 'Add an ID  <code>script</code> element has a closing tag.')"
+      ],
+      "challengeSeed": [
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('img').addClass('animated bounce');",
+        "    $('.btn').addClass('animated shake');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
 
     {
       "_id": "bad87fee1348bd9aeda08826",
-      "name": "Waypoint: Target an element by ID Using jQuery",
+      "name": "Waypoint: Target Elements by ID Using jQuery",
       "difficulty": 0.075,
       "description": [
 
@@ -89,7 +194,37 @@
 
       ],
       "challengeSeed": [
-
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('img').addClass('animated bounce');",
+        "    $('.btn').addClass('animated shake');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo' id='cat-photo-form'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
@@ -105,7 +240,38 @@
 
       ],
       "challengeSeed": [
-
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('img').addClass('animated bounce');",
+        "    $('.btn').addClass('animated shake');",
+        "    $('.cat-photo-form').addClass('animated pulse');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo' id='cat-photo-form'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },

From 7cfca0b5f8831b72c5c7e62c2570b3619d1a2f46 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Sat, 6 Jun 2015 23:58:27 -0400
Subject: [PATCH 03/28] Bump a delay on test runs and show pattern for expect
 tests

---
 .../js/lib/coursewares/iFrameScripts_0.0.4.js | 27 ++++++++++---------
 .../challenges/future-jquery-ajax-json.json   | 13 ++++-----
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/public/js/lib/coursewares/iFrameScripts_0.0.4.js b/public/js/lib/coursewares/iFrameScripts_0.0.4.js
index 7691582f4a..2092acc066 100644
--- a/public/js/lib/coursewares/iFrameScripts_0.0.4.js
+++ b/public/js/lib/coursewares/iFrameScripts_0.0.4.js
@@ -3,18 +3,21 @@
   var tests = parent.tests;
   var editor = parent.editorValueForIFrame;
 
-  for (var i = 0; i < tests.length; i++) {
-    var thisTest = true;
-    try {
-      eval(parent.tests[i]);
-    } catch (err) {
-      allTestsGood = false;
-      thisTest = false;
-      parent.postError(JSON.stringify(err.message.split(':').shift()));
-    } finally {
-      if (thisTest) {
-        parent.postSuccess(JSON.stringify(tests[i].split(',').pop().replace(/\'/g, '').replace(/\)/, '')));
+  setTimeout(function() {
+    for (var i = 0; i < tests.length; i++) {
+      var thisTest = true;
+      try {
+        eval(parent.tests[i]);
+      } catch (err) {
+        allTestsGood = false;
+        thisTest = false;
+        parent.postError(JSON.stringify(err.message.split(':').shift()));
+      } finally {
+        if (thisTest) {
+          parent.postSuccess(JSON.stringify(tests[i].split(',').pop().replace(
+            /\'/g, '').replace(/\)/, '')));
+        }
       }
     }
-  }
+  }, 250);
 })();
diff --git a/seed_data/challenges/future-jquery-ajax-json.json b/seed_data/challenges/future-jquery-ajax-json.json
index d82aba2915..acab88f2c6 100644
--- a/seed_data/challenges/future-jquery-ajax-json.json
+++ b/seed_data/challenges/future-jquery-ajax-json.json
@@ -1,8 +1,7 @@
 {
   "name": "jQuery, Ajax and JSON",
-  "order" : 0.004,
-  "challenges": [
-    {
+  "order": 0.004,
+  "challenges": [{
       "_id": "bad87fee1348bd9acdd08826",
       "name": "Waypoint: Learn how Script Tags and Document Ready Work",
       "difficulty": 0.072,
@@ -54,7 +53,7 @@
         "Make all <code>img</code> elements bounce $('img').addClass('animated bounce')"
       ],
       "tests": [
-
+        "expect($('img'), 'Make sure you add the animated bounce class').to.have.class('animated bounce')"
       ],
       "challengeSeed": [
         "fccss",
@@ -483,8 +482,7 @@
 
       ],
       "challengeType": 0
-    },
-    {
+    }, {
       "_id": "bad87fee1348bd9aede08826",
       "name": "Waypoint: Use Hex Codes for Precise Colors",
       "difficulty": 0.071,
@@ -498,8 +496,7 @@
 
       ],
       "challengeType": 0
-    },
-    {
+    }, {
       "_id": "bad87fee1348bd9aedd08826",
       "name": "Waypoint: Use Shortened Hex Codes for Colors",
       "difficulty": 0.071,

From feb0678a46d98d279461de5adb119ca99894fb93 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sat, 6 Jun 2015 22:51:39 -0700
Subject: [PATCH 04/28] start shrinking down the views.

---
 controllers/challenge.js        |  7 ++-----
 public/css/main.less            |  4 ++++
 views/coursewares/showHTML.jade | 26 +++++++-------------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/controllers/challenge.js b/controllers/challenge.js
index 12a3c3655e..f9f2057b07 100644
--- a/controllers/challenge.js
+++ b/controllers/challenge.js
@@ -200,8 +200,7 @@ exports.returnIndividualChallenge = function(req, res, next) {
             title: challenge.name,
             dashedName: dashedName,
             name: challenge.name,
-            brief: challenge.description[0],
-            details: challenge.description.slice(1),
+            details: challenge.description,
             tests: challenge.tests,
             challengeSeed: challenge.challengeSeed,
             verb: resources.randomVerb(),
@@ -218,8 +217,7 @@ exports.returnIndividualChallenge = function(req, res, next) {
             title: challenge.name,
             dashedName: dashedName,
             name: challenge.name,
-            brief: challenge.description[0],
-            details: challenge.description.slice(1),
+            details: challenge.description,
             tests: challenge.tests,
             challengeSeed: challenge.challengeSeed,
             verb: resources.randomVerb(),
@@ -283,7 +281,6 @@ exports.returnIndividualChallenge = function(req, res, next) {
             dashedName: dashedName,
             name: challenge.name,
             difficulty: Math.floor(+challenge.difficulty),
-            brief: challenge.description.shift(),
             details: challenge.description,
             tests: challenge.tests,
             challengeSeed: challenge.challengeSeed,
diff --git a/public/css/main.less b/public/css/main.less
index 245fc0a974..9021520075 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -251,6 +251,10 @@ ul {
   margin-top: -20px;
 }
 
+.negative-bottom-margin-30 {
+  margin-bottom: -30px;
+}
+
 .large-p {
   font-size: 18px;
 }
diff --git a/views/coursewares/showHTML.jade b/views/coursewares/showHTML.jade
index a3cf951946..56cc0fbc80 100644
--- a/views/coursewares/showHTML.jade
+++ b/views/coursewares/showHTML.jade
@@ -25,26 +25,14 @@ block content
                 .well
                     .row
                         .col-xs-12
-                            h2.text-center= name
+                            h4.text-center.negative-10= name
                             .bonfire-instructions
-                                p.wrappable!= brief
-                                #brief-instructions
-                                    #more-info.btn.btn-primary.btn-block.btn-primary-ghost
-                                        span.ion-arrow-down-b
-                                        | More information
-                                #long-instructions.row.hide
-                                    .col-xs-12
-                                        for sentence in details
-                                            p.wrappable!= sentence
-                                        #less-info.btn.btn-primary.btn-block.btn-primary-ghost
-                                            span.ion-arrow-up-b
-                                            | Less information
-                    br
+                                for sentence in details
+                                    p.wrappable.!= sentence
+                                .negative-bottom-margin-30
                 if (user)
-                    a.btn.btn-primary.btn-big.btn-block#next-courseware-button
-                        |  Go to my next challenge
-                        br
-                        |  (ctrl + enter)
+                    a.btn.btn-primary.btn-sm.btn-block.negative-10#next-courseware-button Go to my next challenge (ctrl + enter)
+
                     if (user.sentSlackInvite)
                         .button-spacer
                         .btn-group.input-group.btn-group-justified
@@ -58,7 +46,7 @@ block content
                     script.
                         var userLoggedIn = true;
                 else
-                    a.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
+                    a.btn.signup-btn.btn-block.btn-sm.btn-block.negative-15(href='/login') Sign in so you can save your progress
                         script.
                             var userLoggedIn = false;
                 .button-spacer

From 6953cb634780b8cdec9e7bcf2f2b380495e9e38e Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sat, 6 Jun 2015 22:55:24 -0700
Subject: [PATCH 05/28] make the view even more compact

---
 public/css/main.less                                        | 4 ++--
 public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/css/main.less b/public/css/main.less
index 9021520075..172368c69e 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -176,8 +176,8 @@ ul {
   font-size: 26px;
 }
 
-.ten-pixel-break {
-  height: 10px;
+.five-pixel-break {
+  height: 5px;
 }
 
 .fifteen-pixel-break {
diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js
index fdb9c84ed8..2940b20b15 100644
--- a/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js
+++ b/public/js/lib/coursewares/coursewaresHCJQFramework_0.1.9.js
@@ -90,7 +90,7 @@ var testResults = [];
 var postSuccess = function(data) {
   var testDoc = document.createElement("div");
   $(testDoc)
-    .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>");
+    .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-checkmark-circled big-success-icon'></i></div><div class='col-xs-10 test-output test-vertical-center wrappable'>" + JSON.parse(data) + "</div>");
   $('#testSuite').append(testDoc);
   testSuccess();
 };
@@ -98,7 +98,7 @@ var postSuccess = function(data) {
 var postError = function(data) {
   var testDoc = document.createElement("div");
   $(testDoc)
-    .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-vertical-center test-output wrappable'>" + JSON.parse(data) + "</div></div><div class='ten-pixel-break'/>");
+    .html("<div class='row'><div class='col-xs-2 text-center'><i class='ion-close-circled big-error-icon'></i></div><div class='col-xs-10 test-vertical-center test-output wrappable'>" + JSON.parse(data) + "</div>");
   $('#testSuite').append(testDoc);
 };
 var goodTests = 0;

From b84d41bcd659730f826e6ad37a2d821dc9037ed1 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sun, 7 Jun 2015 18:29:00 -0700
Subject: [PATCH 06/28] write tests for first 5 jquery challenges

---
 public/js/lib/coursewares/iFrameScripts_0.0.4.js  |  2 +-
 seed_data/challenges/future-jquery-ajax-json.json | 12 +++++++-----
 views/coursewares/showHTML.jade                   |  8 +++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/public/js/lib/coursewares/iFrameScripts_0.0.4.js b/public/js/lib/coursewares/iFrameScripts_0.0.4.js
index 2092acc066..1d5db5413d 100644
--- a/public/js/lib/coursewares/iFrameScripts_0.0.4.js
+++ b/public/js/lib/coursewares/iFrameScripts_0.0.4.js
@@ -19,5 +19,5 @@
         }
       }
     }
-  }, 250);
+  }, 10);
 })();
diff --git a/seed_data/challenges/future-jquery-ajax-json.json b/seed_data/challenges/future-jquery-ajax-json.json
index acab88f2c6..1fbadc7649 100644
--- a/seed_data/challenges/future-jquery-ajax-json.json
+++ b/seed_data/challenges/future-jquery-ajax-json.json
@@ -53,7 +53,8 @@
         "Make all <code>img</code> elements bounce $('img').addClass('animated bounce')"
       ],
       "tests": [
-        "expect($('img'), 'Make sure you add the animated bounce class').to.have.class('animated bounce')"
+        "assert($('img').hasClass('animated') && $('img').hasClass('bounce'), 'Use the jQuery <code>addClass()</code> function to give the classes \"animated\" and \"bounce\" to your <code>img</code> element.')",
+        "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [
         "fccss",
@@ -98,13 +99,13 @@
 
       ],
       "tests": [
-
+        "assert($('.btn').hasClass('animated') && $('.btn').hasClass('shake'), 'Use the jQuery <code>addClass()</code> function to give the classes \"animated\" and \"shake\" to all your elements with the class \"btn\".')",
+        "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [
         "fccss",
         "  $(document).ready(function() {",
         "    $('img').addClass('animated bounce');",
-        "    $('.btn').addClass('animated shake');",
         "  });",
         "fcces",
         "<br>",
@@ -144,7 +145,7 @@
 
       ],
       "tests": [
-        "assert($('form').attr('id') === 'cat-photo-form', 'Add an ID  <code>script</code> element has a closing tag.')"
+        "assert($('form').attr('id') === 'cat-photo-form', 'Add the ID of \"cat-photo-form\" to your <code>form</code> element.')"
       ],
       "challengeSeed": [
         "fccss",
@@ -190,7 +191,8 @@
 
       ],
       "tests": [
-
+        "assert($('#cat-photo-form') && $('#cat-photo-form').hasClass('animated') && $('#cat-photo-form').hasClass('pulse'), 'Select the element with the <code>id</code> of \"cat-photo-form\" and use the jQuery <code>addClass()</code> function to give it the classes of \"animated\" and \"pulse\".')",
+        "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [
         "fccss",
diff --git a/views/coursewares/showHTML.jade b/views/coursewares/showHTML.jade
index 56cc0fbc80..88e8ed7f72 100644
--- a/views/coursewares/showHTML.jade
+++ b/views/coursewares/showHTML.jade
@@ -28,10 +28,12 @@ block content
                             h4.text-center.negative-10= name
                             .bonfire-instructions
                                 for sentence in details
-                                    p.wrappable.!= sentence
+                                    p.wrappable.negative-10!= sentence
                                 .negative-bottom-margin-30
                 if (user)
-                    a.btn.btn-primary.btn-sm.btn-block.negative-10#next-courseware-button Go to my next challenge (ctrl + enter)
+                    label.btn.btn-primary.btn-block.negative-10#next-courseware-button
+                        .ion-checkmark-circled
+                            | &nbsp; Go to my next challenge (ctrl + enter)
 
                     if (user.sentSlackInvite)
                         .button-spacer
@@ -46,7 +48,7 @@ block content
                     script.
                         var userLoggedIn = true;
                 else
-                    a.btn.signup-btn.btn-block.btn-sm.btn-block.negative-15(href='/login') Sign in so you can save your progress
+                    a.btn.signup-btn.btn-block.btn-block.negative-15(href='/login') Sign in so you can save your progress
                         script.
                             var userLoggedIn = false;
                 .button-spacer

From 662c17de9009f21bb0de2efdccb32d78c94f6b21 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sun, 7 Jun 2015 19:46:28 -0700
Subject: [PATCH 07/28] get a couple more waypoints working

---
 .../challenges/future-jquery-ajax-json.json   | 55 ++++++++++++-------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/seed_data/challenges/future-jquery-ajax-json.json b/seed_data/challenges/future-jquery-ajax-json.json
index 1fbadc7649..16fb6d6e09 100644
--- a/seed_data/challenges/future-jquery-ajax-json.json
+++ b/seed_data/challenges/future-jquery-ajax-json.json
@@ -238,14 +238,15 @@
 
       ],
       "tests": [
-
+        "assert(!editor.match(/nce\\'\\)\\;/g) && !editor.match(/ke\\'\\)\\;/g), 'Delete your <code>img</code> element selector statement and your \".btn\" selector statement.')",
+        "assert(editor.match(/css.*,.*background-color.*red.\\);/g), 'Select the element with the <code>id</code> of \"cat-photo-form\" give it the background color of red.')"
       ],
       "challengeSeed": [
         "fccss",
         "  $(document).ready(function() {",
         "    $('img').addClass('animated bounce');",
         "    $('.btn').addClass('animated shake');",
-        "    $('.cat-photo-form').addClass('animated pulse');",
+        "    $('#cat-photo-form').addClass('animated pulse');",
         "  });",
         "fcces",
         "<br>",
@@ -285,10 +286,40 @@
 
       ],
       "tests": [
-
+        "assert($('form button').attr('id') === 'submit-button', 'Add the ID of \"submit-button\" to your the <code>button</code> on your <code>form</code> element.')",
+        "assert($('#submit-button') && $('#submit-button').prop('disabled'), 'Disable your element with the id of \"submit-button\".')"
       ],
       "challengeSeed": [
-
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('#cat-photo-form').css('background-color', 'red');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo' id='cat-photo-form'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
@@ -341,22 +372,6 @@
       "challengeType": 0
     },
 
-    {
-      "_id": "bad87fee1348bd9aed408826",
-      "name": "Waypoint: Animate an Element Using jQuery",
-      "difficulty": 0.081,
-      "description": [
-
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-
-      ],
-      "challengeType": 0
-    },
-
     {
       "_id": "bad87fee1348bd9aed308826",
       "name": "Waypoint: Target the Parent of an Element Using jQuery",

From 0c799ec02f2874d21302a06f77e5627c4898a9ca Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sun, 7 Jun 2015 21:49:14 -0700
Subject: [PATCH 08/28] make bonfire view look like html view

---
 public/css/main.less                          |   8 +-
 seed_data/challenges/basic-bonfires.json      |   3 +-
 .../challenges/future-jquery-ajax-json.json   |   4 +-
 views/coursewares/showBonfire.jade            | 123 +++++++++---------
 views/coursewares/showHTML.jade               |  81 ++++++------
 5 files changed, 105 insertions(+), 114 deletions(-)

diff --git a/public/css/main.less b/public/css/main.less
index 172368c69e..5fd00056d7 100644
--- a/public/css/main.less
+++ b/public/css/main.less
@@ -201,12 +201,12 @@ ul {
 .responsive-container { position: relative; padding-bottom: 56.25%; padding-top: 30px; height: 0; overflow: hidden; }
 .responsive-container iframe { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
 
-.positive-5 {
-  margin-top: 5px;
+.positive-10 {
+  margin-top: 10px;
 }
 
-.positive-10 {
-  padding-top: 10px;
+.positive-15-bottom {
+  margin-bottom: 15px;
 }
 
 .positive-15 {
diff --git a/seed_data/challenges/basic-bonfires.json b/seed_data/challenges/basic-bonfires.json
index d067eed8e3..186bd5c7b3 100644
--- a/seed_data/challenges/basic-bonfires.json
+++ b/seed_data/challenges/basic-bonfires.json
@@ -43,9 +43,8 @@
       "name": "Bonfire: Meet Bonfire",
       "difficulty": "0",
       "description": [
-        "Click the button below for further instructions.",
         "Your goal is to fix the failing test.",
-        "First, run all the tests by clicking \"Run code\" or by pressing Control + Enter",
+        "First, run all the tests by clicking \"Run code\" or by pressing Control + Enter.",
         "The failing test is in red. Fix the code so that all tests pass. Then you can move on to the next Bonfire.",
         "Make this function return true no matter what."
       ],
diff --git a/seed_data/challenges/future-jquery-ajax-json.json b/seed_data/challenges/future-jquery-ajax-json.json
index 16fb6d6e09..87d261721a 100644
--- a/seed_data/challenges/future-jquery-ajax-json.json
+++ b/seed_data/challenges/future-jquery-ajax-json.json
@@ -239,7 +239,7 @@
       ],
       "tests": [
         "assert(!editor.match(/nce\\'\\)\\;/g) && !editor.match(/ke\\'\\)\\;/g), 'Delete your <code>img</code> element selector statement and your \".btn\" selector statement.')",
-        "assert(editor.match(/css.*,.*background-color.*red.\\);/g), 'Select the element with the <code>id</code> of \"cat-photo-form\" give it the background color of red.')"
+        "assert(editor.match(/css.*,.*background-color.*gray.\\);/g), 'Select the element with the <code>id</code> of \"cat-photo-form\" give it the background color of gray.')"
       ],
       "challengeSeed": [
         "fccss",
@@ -292,7 +292,7 @@
       "challengeSeed": [
         "fccss",
         "  $(document).ready(function() {",
-        "    $('#cat-photo-form').css('background-color', 'red');",
+        "    $('#cat-photo-form').css('background-color', 'gray');",
         "  });",
         "fcces",
         "<br>",
diff --git a/views/coursewares/showBonfire.jade b/views/coursewares/showBonfire.jade
index 4270e5975a..005ed1f1b7 100644
--- a/views/coursewares/showBonfire.jade
+++ b/views/coursewares/showBonfire.jade
@@ -17,11 +17,11 @@ block content
     script(type='text/javascript', src='/js/lib/coursewares/sandbox.js')
 
     .row(ng-controller="pairedWithController")
-        .col-xs-12.col-sm-12.col-md-4.bonfire-top
-            #testCreatePanel
-                h1#bonfire-name.text-center= name
-                h2.text-center
-                    .bonfire-flames Difficulty:&thinsp;
+        .col-xs-12.col-sm-12.col-md-4.col-lg-3
+            #testCreatePanel.well
+                h3.text-center.negative-10= name
+                .positive-15.positive-15-bottom
+                    h4.text-center.bonfire-flames Difficulty:&thinsp;
                         if (difficulty == "0")
                             i.ion-ios-flame-outline
                             i.ion-ios-flame-outline
@@ -58,67 +58,61 @@ block content
                             i.ion-ios-flame
                             i.ion-ios-flame
                             i.ion-ios-flame
-                .well
-                    .row
-                        .col-xs-12
-                            .bonfire-instructions
-                                p.wrappable= brief
-                                #brief-instructions
-                                    #more-info.btn.btn-primary.btn-block.btn-primary-ghost
-                                        span.ion-arrow-down-b
-                                        | More information
-                                #long-instructions.row.hide
-                                    .col-xs-12
-                                        for sentence in details
-                                            p.wrappable!= sentence
-                                        #MDN-links
-                                            p Here are some helpful links:
-                                            for link, index in MDNlinks
-                                                ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]}
-                                        #less-info.btn.btn-primary.btn-block.btn-primary-ghost
-                                            span.ion-arrow-up-b
-                                            | Less information
+                .row
+                    .col-xs-12
+                        .bonfire-instructions
+                            for sentence in details
+                                p.wrappable.negative-10!= sentence
+                            .negative-bottom-margin-30
+                                #MDN-links
+                                    p.negative-10 Here are some helpful links:
+                                    for link, index in MDNlinks
+                                        .negative-10
+                                            ul: li: a(href=""+link, target="_blank") !{MDNkeys[index]}
 
-                if (user)
-                    form.form-horizontal(novalidate='novalidate', name='completedWithForm')
-                        .form-group.text-center
-                            .col-xs-12
-                                // extra field to distract password tools like lastpass from injecting css into our username field
-                                input.form-control(ng-show="false")
-                                input.form-control#completed-with(name="existingUser", placeholder="Your pair's username if pairing", existing-username='', ng-model="existingUser")
-                            .col-xs-12(ng-cloak, ng-show="completedWithForm.$error.exists && !completedWithForm.existingUser.$pristine && existingUser.length > 0")
-                                alert(type='danger')
-                                    span.ion-close-circled
-                                    | Username not found
-                #submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
-                if (user && user.sentSlackInvite)
-                    .button-spacer
-                    .btn-group.input-group.btn-group-justified
-                        label.btn.btn-success#trigger-help-modal
-                            i.fa.fa-medkit
-                                | &nbsp; Help
-                        label.btn.btn-success#trigger-pair-modal
-                            i.fa.fa-user-plus
-                                | &nbsp; Pair
-                        label.btn.btn-success#trigger-issue-modal
-                            i.fa.fa-bug
-                                | &nbsp; Bug
+            if (user)
+                form.form-horizontal(novalidate='novalidate', name='completedWithForm')
+                    .form-group.text-center.negative-10
+                        .col-xs-12
+                            // extra field to distract password tools like lastpass from injecting css into our username field
+                            input.form-control(ng-show="false")
+                            input.form-control#completed-with(name="existingUser", placeholder="Your pair's username if pairing", existing-username='', ng-model="existingUser")
+                        .col-xs-12(ng-cloak, ng-show="completedWithForm.$error.exists && !completedWithForm.existingUser.$pristine && existingUser.length > 0")
+                            alert(type='danger')
+                                span.ion-close-circled
+                                | Username not found
+            label.negative-10.btn.btn-primary.btn-block#submitButton
+                i.fa.fa-play
+                    | &nbsp; Run code (ctrl + enter)
+
+            if (user && user.sentSlackInvite)
                 .button-spacer
-                form.code
-                    .form-group.codeMirrorView
-                        textarea#codeOutput(style='display: none;')
-                br
-                #testSuite
-                br
-                script(type="text/javascript").
-                    var tests = !{JSON.stringify(tests)};
-                    var challengeSeed = !{JSON.stringify(challengeSeed)};
-                    var challenge_Id = !{JSON.stringify(challengeId)};
-                    var challenge_Name = !{JSON.stringify(name)};
-                    var started = Math.floor(Date.now());
-                    var challengeType = !{JSON.stringify(challengeType)};
-                    var _ = R;
-                    var dashed = !{JSON.stringify(dashedName)};
+                .btn-group.input-group.btn-group-justified
+                    label.btn.btn-success#trigger-help-modal
+                        i.fa.fa-medkit
+                            | &nbsp; Help
+                    label.btn.btn-success#trigger-pair-modal
+                        i.fa.fa-user-plus
+                            | &nbsp; Pair
+                    label.btn.btn-success#trigger-issue-modal
+                        i.fa.fa-bug
+                            | &nbsp; Bug
+            .button-spacer
+            form.code
+                .form-group.codeMirrorView
+                    textarea#codeOutput(style='display: none;')
+            br
+            #testSuite.negative-10
+            br
+            script(type="text/javascript").
+                var tests = !{JSON.stringify(tests)};
+                var challengeSeed = !{JSON.stringify(challengeSeed)};
+                var challenge_Id = !{JSON.stringify(challengeId)};
+                var challenge_Name = !{JSON.stringify(name)};
+                var started = Math.floor(Date.now());
+                var challengeType = !{JSON.stringify(challengeType)};
+                var _ = R;
+                var dashed = !{JSON.stringify(dashedName)};
 
         .col-xs-12.col-sm-12.col-md-8
             #mainEditorPanel
@@ -140,7 +134,6 @@ block content
 
                         a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) Go to my next challenge (ctrl + enter)
 
-
                         if (user.progressTimestamps.length > 2)
                             a.animated.fadeIn.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript")
                                 i.fa.fa-twitter &thinsp;
diff --git a/views/coursewares/showHTML.jade b/views/coursewares/showHTML.jade
index 88e8ed7f72..2ebc64d0dd 100644
--- a/views/coursewares/showHTML.jade
+++ b/views/coursewares/showHTML.jade
@@ -20,49 +20,48 @@ block content
     script(src='/js/lib/codemirror/mode/htmlmixed/htmlmixed.js')
     script(src='/js/lib/codemirror/addon/emmet/emmet.js')
     .row.courseware-height
-        .vertical-scroll
-            .col-xs-12.col-sm-12.col-md-3.col-lg-3
-                .well
-                    .row
-                        .col-xs-12
-                            h4.text-center.negative-10= name
-                            .bonfire-instructions
-                                for sentence in details
-                                    p.wrappable.negative-10!= sentence
-                                .negative-bottom-margin-30
-                if (user)
-                    label.btn.btn-primary.btn-block.negative-10#next-courseware-button
-                        .ion-checkmark-circled
-                            | &nbsp; Go to my next challenge (ctrl + enter)
+        .col-xs-12.col-sm-12.col-md-3.col-lg-3
+            .well
+                .row
+                    .col-xs-12
+                        h3.text-center.negative-10= name
+                        .bonfire-instructions
+                            for sentence in details
+                                p.wrappable.negative-10!= sentence
+                            .negative-bottom-margin-30
+            if (user)
+                label.btn.btn-primary.btn-block.negative-10#next-courseware-button
+                    .ion-checkmark-circled
+                        | &nbsp; Go to my next challenge (ctrl + enter)
 
-                    if (user.sentSlackInvite)
-                        .button-spacer
-                        .btn-group.input-group.btn-group-justified
-                            label.btn.btn-success#trigger-help-modal
-                                i.fa.fa-medkit
-                                    | &nbsp; Help
-                            label.btn.btn-success#trigger-issue-modal
-                                i.fa.fa-bug
-                                    | &nbsp; Bug
-                        .button-spacer
+                if (user.sentSlackInvite)
+                    .button-spacer
+                    .btn-group.input-group.btn-group-justified
+                        label.btn.btn-success#trigger-help-modal
+                            i.fa.fa-medkit
+                                | &nbsp; Help
+                        label.btn.btn-success#trigger-issue-modal
+                            i.fa.fa-bug
+                                | &nbsp; Bug
+                    .button-spacer
+                script.
+                    var userLoggedIn = true;
+            else
+                a.btn.signup-btn.btn-block.btn-block.negative-15(href='/login') Sign in so you can save your progress
                     script.
-                        var userLoggedIn = true;
-                else
-                    a.btn.signup-btn.btn-block.btn-block.negative-15(href='/login') Sign in so you can save your progress
-                        script.
-                            var userLoggedIn = false;
-                .button-spacer
-                ul#testSuite.list-group
-                br
-                script(type="text/javascript").
-                    $('#next-courseware-button').attr('disabled', 'disabled');
-                    var tests = !{JSON.stringify(tests)};
-                    var challengeSeed = !{JSON.stringify(challengeSeed)};
-                    var challenge_Id = !{JSON.stringify(challengeId)};
-                    var challenge_Name = !{JSON.stringify(name)};
-                    var prodOrDev = !{JSON.stringify(environment)};
-                    var challengeType = !{JSON.stringify(challengeType)};
-                    var started = Math.floor(Date.now());
+                        var userLoggedIn = false;
+            .button-spacer
+            ul#testSuite.list-group
+            br
+            script(type="text/javascript").
+                $('#next-courseware-button').attr('disabled', 'disabled');
+                var tests = !{JSON.stringify(tests)};
+                var challengeSeed = !{JSON.stringify(challengeSeed)};
+                var challenge_Id = !{JSON.stringify(challengeId)};
+                var challenge_Name = !{JSON.stringify(name)};
+                var prodOrDev = !{JSON.stringify(environment)};
+                var challengeType = !{JSON.stringify(challengeType)};
+                var started = Math.floor(Date.now());
         .col-xs-12.col-sm-12.col-md-5.col-lg-6
             #mainEditorPanel
                 form.code

From c7ce5784ad8722533666478f7979c9082169a803 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sun, 7 Jun 2015 22:49:14 -0700
Subject: [PATCH 09/28] add additional jQuery waypoint

---
 .../challenges/future-jquery-ajax-json.json   | 68 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 3 deletions(-)

diff --git a/seed_data/challenges/future-jquery-ajax-json.json b/seed_data/challenges/future-jquery-ajax-json.json
index 87d261721a..279f41224a 100644
--- a/seed_data/challenges/future-jquery-ajax-json.json
+++ b/seed_data/challenges/future-jquery-ajax-json.json
@@ -332,10 +332,41 @@
 
       ],
       "tests": [
-
+        "assert($('img').length === 0, 'Use jQuery to remove your <code>img</code> element from your page.')",
+        "assert(editor.match(/<img/g), 'You should still have an <code>img</code> element in your HTML but jQuery should remove it.')"
       ],
       "challengeSeed": [
-
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('#cat-photo-form').css('background-color', 'gray');",
+        "    $('#submit-button').prop('disabled', 'true');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo' id='cat-photo-form'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' id='submit-button' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
@@ -345,7 +376,38 @@
       "name": "Waypoint: Move an Element Using jQuery",
       "difficulty": 0.079,
       "description": [
-
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('#cat-photo-form').css('background-color', 'gray');",
+        "    $('#submit-button').prop('disabled', 'true');",
+        "    $('img').remove();",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo' id='cat-photo-form'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' id='submit-button' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "tests": [
 

From d56cee1f7217eb871f81311d15a97087cdc9391c Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 11 Jun 2015 15:01:21 -0700
Subject: [PATCH 10/28] update challenge map and news nav

---
 views/challengeMap/show.jade | 37 ++++++++++++++++++------------------
 views/stories/news-nav.jade  |  9 +++++----
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade
index f8adbff6c1..bc65012fb2 100644
--- a/views/challengeMap/show.jade
+++ b/views/challengeMap/show.jade
@@ -83,22 +83,21 @@ block content
                                                 li.large-p.negative-10
                                                     a(href="/challenges/#{challenge.name}")= challenge.name
 
-    //#announcementModal.modal(tabindex='-1')
-    //    .modal-dialog.animated.fadeInUp.fast-animation
-    //        .modal-content
-    //            .modal-header.challenge-list-header Join our Saturday Summit!
-    //                a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
-    //            .modal-body
-    //                h3.text-left Saturday at Noon EDT: We'll live-stream our Saturday Summit on Twitch.tv.
-    //                h3.text-left We'll announce our new Front End Development Certificate Program (it's free, of course) and our new "Free Code Camp On The Go" app. &thinsp;
-    //                    a(href='http://www.freecodecamp.com/twitch', target='_blank') Add us to your calendar here
-    //                    | .
-    //                a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='http://twitch.tv/freecodecamp', target='_blank') Follow us on Twitch.tv
-    //                a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up!
-    //script.
-    //    $(document).ready(function () {
-    //        if (!localStorage || !localStorage.day234) {
-    //            $('#announcementModal').modal('show');
-    //            localStorage.day234 = "true";
-    //        }
-    //    });
+    #announcementModal.modal(tabindex='-1')
+        .modal-dialog.animated.fadeInUp.fast-animation
+            .modal-content
+                .modal-header.challenge-list-header Add us on LinkedIn
+                    a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
+                .modal-body
+                    img.img-responsive-img-center(src='https://www.evernote.com/l/AHTzkHwtg-BHj57bqqDL7WFF8WgrI5V8cxwB/image.png')
+                    h3.text-left LinkedIn now recognizes Free Code Camp as a university.
+                    h3.text-left Add Free Code Camp to your LinkedIn profile - it takes less than a minute.
+                    a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/freecodecamp/linkedin', target='_blank') 
+                    a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up!
+    script.
+        $(document).ready(function () {
+            if (!localStorage || !localStorage.linkedIn) {
+                $('#announcementModal').modal('show');
+                localStorage.linkedIn = "true";
+            }
+        });
diff --git a/views/stories/news-nav.jade b/views/stories/news-nav.jade
index 6408520a20..c032a640e4 100644
--- a/views/stories/news-nav.jade
+++ b/views/stories/news-nav.jade
@@ -15,10 +15,11 @@
 .spacer
 .row
     .col-xs-12.col-sm-8.col-sm-offset-2.well
-        h4.text-center Which Coders are Worth Following on Twitter?
-        img.img-responsive(src='https://www.evernote.com/l/AHQLuyBNcVpKj5TRhNzWssVuCvbRIEylm3oB/image.png')
-        p Share a link to the Twitter profile of your choice, and tell us in 140 characters or less why this person is a "Coder Worth Following".
-        p Use the headline: "Coder Worth Following: (their Twitter handle)". We'll publish a list of the 25 most-upvoted submissions (and the campers who submitted them) in Wednesday's blog post. Also - as always - you'll get 1 point every time someone upvotes your post.
+        h4.text-center Which other free resources do you use?
+        img.img-responsive(src='https://www.evernote.com/l/AHRNhlwViM1Kh5qCm6iy7MSWrbdyxYbRkWkB/image.png')
+        p Link us to your favorite free coding resources.
+        p These books, video series and podcasts should be be legally available for free.
+        p Use the headline: "Awesome Free Resource: (the book/podcast/video series name)". We'll publish a list of the 25 most-upvoted resources (and the campers who submitted them) in Wednesday's blog post. Also - as always - you'll get 1 point every time someone upvotes your post.
 .spacer
 
 #search-results

From 1e8d58068c6d1608c635617454cf7d0772af95f4 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 11 Jun 2015 15:34:06 -0700
Subject: [PATCH 11/28] add LinkedIn easy route

---
 app.js                       |  4 ++++
 seed_data/field-guides.json  | 17 +++++++++++++++++
 views/challengeMap/show.jade |  2 +-
 views/partials/footer.jade   |  3 +++
 views/stories/news-nav.jade  |  3 +--
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app.js b/app.js
index 6ec67f2611..a265e530de 100755
--- a/app.js
+++ b/app.js
@@ -227,6 +227,10 @@ app.get('/nonprofit-project-instructions', function(req, res) {
   res.redirect(301, '/field-guide/how-do-free-code-camps-nonprofit-projects-work');
 });
 
+app.get('/linkedin', function(req, res) {
+  res.redirect(301, '/field-guide/can-i-add-free-code-camp-to-my-linkedin-profile');
+});
+
 app.post('/get-help', resourcesController.getHelp);
 
 app.post('/get-pair', resourcesController.getPair);
diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json
index 56ad3be106..61513d28c7 100644
--- a/seed_data/field-guides.json
+++ b/seed_data/field-guides.json
@@ -231,6 +231,23 @@
       "</div>"
     ]
   },
+  {
+    "_id": "bd7158d9c436eddfaeb5bd2e",
+    "name": "Can I add Free Code Camp to my LinkedIn profile?",
+    "dashedName": "can-i-add-free-code-camp-to-my-linkedin-profile",
+    "description": [
+      "<div class=\"col-xs-12 col-sm-10 col-sm-offset-1\">",
+      "  <h3>LinkedIn recognizes Free Code Camp as a university.</h3>",
+      "  <p class='large-p'>You can explore our alumni activity <a href='https://www.linkedin.com/edu/school?id=166029' target='_blank'>here</a>.</p>",
+      "  <p class='large-p'>You should add Free Code Camp to your LinkedIn profile. Here's how:</p>",
+      "  <ol>",
+      "    <li class='large-li'>Follow this link: <a href='https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp' target='_blank'>https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp</a></li>",
+      "    <li class='large-li'>Follow these instructions:<img class='img-responsive img-center' src='https://www.evernote.com/l/AHRnpH-PN-JPQa9_u8FSOzejNG-tX40h1fkB/image.png'></li>",
+      "  </ol>",
+      "  <p class='large-p'>Once you complete our curriculum (or complete at least one Nonprofit Project and then get a coding job), we will issue you an official Full Stack Web Development certificate that you can also add to your LinkedIn profile.</p>",
+      "</div>"
+    ]
+  },
   {
     "_id": "bd7158d9c436eddfaeb5bd3f",
     "name": "Can I jump around in this guide?",
diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade
index bc65012fb2..e7b8e8c969 100644
--- a/views/challengeMap/show.jade
+++ b/views/challengeMap/show.jade
@@ -92,7 +92,7 @@ block content
                     img.img-responsive-img-center(src='https://www.evernote.com/l/AHTzkHwtg-BHj57bqqDL7WFF8WgrI5V8cxwB/image.png')
                     h3.text-left LinkedIn now recognizes Free Code Camp as a university.
                     h3.text-left Add Free Code Camp to your LinkedIn profile - it takes less than a minute.
-                    a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/freecodecamp/linkedin', target='_blank') 
+                    a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/freecodecamp/linkedin', target='_blank')
                     a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up!
     script.
         $(document).ready(function () {
diff --git a/views/partials/footer.jade b/views/partials/footer.jade
index 6230b178ad..fe25c7723a 100644
--- a/views/partials/footer.jade
+++ b/views/partials/footer.jade
@@ -3,6 +3,7 @@
         a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank') &nbsp;Blog&nbsp;&nbsp;
         a.ion-social-github(href="http://github.com/freecodecamp", target='_blank') &nbsp;GitHub&nbsp;&nbsp;
         a.ion-social-twitch-outline(href="/twitch") &thinsp;Twitch&nbsp;
+        a.ion-social-linkedin(href="/linkedin") &thinsp;LinkedIn&nbsp;
         a.ion-social-facebook(href="/field-guide/how-can-i-find-other-free-code-camp-campers-in-my-city") &nbsp;Facebook&nbsp;&nbsp;
         a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank') &nbsp;Twitter&nbsp;&nbsp;
         a.ion-locked(href="/privacy") &nbsp;Privacy&nbsp;&nbsp;
@@ -13,6 +14,8 @@
             span.sr-only Free Code Camp on GitHub
         a.ion-social-twitch-outline(href="/twitch")
             span.sr-only Free Code Camp Live Pair Programming on Twitch.tv
+        a.ion-social-linkedin(href="/linkedin")
+            span.sr-only Free Code Camp LinkedIn Alumni Network
         a.ion-social-facebook(href="/field-guide/how-can-i-find-other-free-code-camp-campers-in-my-city")
             span.sr-only Free Code Camp local groups on Facebook
         a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank')
diff --git a/views/stories/news-nav.jade b/views/stories/news-nav.jade
index c032a640e4..48f64ae561 100644
--- a/views/stories/news-nav.jade
+++ b/views/stories/news-nav.jade
@@ -18,8 +18,7 @@
         h4.text-center Which other free resources do you use?
         img.img-responsive(src='https://www.evernote.com/l/AHRNhlwViM1Kh5qCm6iy7MSWrbdyxYbRkWkB/image.png')
         p Link us to your favorite free coding resources.
-        p These books, video series and podcasts should be be legally available for free.
-        p Use the headline: "Awesome Free Resource: (the book/podcast/video series name)". We'll publish a list of the 25 most-upvoted resources (and the campers who submitted them) in Wednesday's blog post. Also - as always - you'll get 1 point every time someone upvotes your post.
+        p Use the headline: "Awesome Free Resource: (the name of the book, podcast, or video series)". We'll publish a list of the 25 most-upvoted resources (and the campers who submitted them) in Wednesday's blog post, and in an upcoming Field Guide article. Also - as always - you'll get 1 point every time someone upvotes your post.
 .spacer
 
 #search-results

From 66d4ffba320dc48d892acdd3ebad8721bb292c36 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 11 Jun 2015 15:46:41 -0700
Subject: [PATCH 12/28] update modal

---
 views/challengeMap/show.jade | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/views/challengeMap/show.jade b/views/challengeMap/show.jade
index e7b8e8c969..594793fbc2 100644
--- a/views/challengeMap/show.jade
+++ b/views/challengeMap/show.jade
@@ -86,14 +86,14 @@ block content
     #announcementModal.modal(tabindex='-1')
         .modal-dialog.animated.fadeInUp.fast-animation
             .modal-content
-                .modal-header.challenge-list-header Add us on LinkedIn
+                .modal-header.challenge-list-header Add us to your LinkedIn profile
                     a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
                 .modal-body
-                    img.img-responsive-img-center(src='https://www.evernote.com/l/AHTzkHwtg-BHj57bqqDL7WFF8WgrI5V8cxwB/image.png')
                     h3.text-left LinkedIn now recognizes Free Code Camp as a university.
-                    h3.text-left Add Free Code Camp to your LinkedIn profile - it takes less than a minute.
-                    a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/freecodecamp/linkedin', target='_blank')
-                    a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up!
+                    img.img-responsive.img-center(src='https://www.evernote.com/l/AHTzkHwtg-BHj57bqqDL7WFF8WgrI5V8cxwB/image.png')
+                    h3.text-left It takes less than a minute to add Free Code Camp to your LinkedIn profile.
+                    a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/linkedin', target='_blank') Show me how to do this
+                    a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up
     script.
         $(document).ready(function () {
             if (!localStorage || !localStorage.linkedIn) {

From 7077b1848041cd7974f0fd9003cb3c31bbd6f427 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 11 Jun 2015 18:57:22 -0700
Subject: [PATCH 13/28] fix twitch view

---
 views/resources/twitch.jade | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/views/resources/twitch.jade b/views/resources/twitch.jade
index 678d983411..1b89b17432 100644
--- a/views/resources/twitch.jade
+++ b/views/resources/twitch.jade
@@ -34,32 +34,32 @@ block content
                                     .col-xs-12.col-sm-12.col-md-6
                                         .embed-responsive.embed-responsive-16by9.big-break
                                             iframe.embed-responsive-item(src='//www.youtube.com/embed/Z_43xApGB9Y')
-                                        p.wrappable.negative-45 link: &thinsp;
+                                        p.wrappable.negative-30 link: &thinsp;
                                             a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/Z_43xApGB9Y
                                     .col-xs-12.col-sm-12.col-md-6
                                         .embed-responsive.embed-responsive-16by9.big-break
                                             iframe.embed-responsive-item(src='//www.youtube.com/embed/PvWHzcebjjQ')
-                                        p.wrappable.negative-45 link: &thinsp;
+                                        p.wrappable.negative-30 link: &thinsp;
                                             a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/PvWHzcebjjQ
                                     .col-xs-12.col-sm-12.col-md-6
                                         .embed-responsive.embed-responsive-16by9.big-break
                                             iframe.embed-responsive-item(src='//www.youtube.com/embed/yHL6mEr-LGY')
-                                        p.wrappable.negative-45 link: &thinsp;
+                                        p.wrappable.negative-30 link: &thinsp;
                                             a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/yHL6mEr-LGY
                                     .col-xs-12.col-sm-12.col-md-6
                                         .embed-responsive.embed-responsive-16by9.big-break
                                             iframe.embed-responsive-item(src='//www.youtube.com/embed/dolG-yRMcPs')
-                                        p.wrappable.negative-45 link: &thinsp;
+                                        p.wrappable.negative-30 link: &thinsp;
                                             a(href="http://www.youtube.com/watch/Fn9HMn79KH0") http://www.youtube.com/watch/dolG-yRMcPs
                                     .col-xs-12.col-sm-12.col-md-6
                                         .embed-responsive.embed-responsive-16by9.big-break
                                             iframe.embed-responsive-item(src='//www.youtube.com/embed/YMz_vrK_KlQ')
-                                        p.wrappable.negative-45 link: &thinsp;
+                                        p.wrappable.negative-30 link: &thinsp;
                                             a(href="http://www.youtube.com/watch/_BErpDdmBOw") http://www.youtube.com/watch/YMz_vrK_KlQ
                                     .col-xs-12.col-sm-12.col-md-6
                                         .embed-responsive.embed-responsive-16by9.big-break
                                             iframe.embed-responsive-item(src='//www.youtube.com/embed/bbFVxaza8Ik')
-                                        p.wrappable.negative-45 link: &thinsp;
+                                        p.wrappable.negative-30 link: &thinsp;
                                             a(href="http://www.youtube.com/watch/S7iRBZJwOAs") http://www.youtube.com/watch/bbFVxaza8Ik
                         br
                         br

From 03df5cf492f4267c4801f4e28e1c913068fed14e Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Thu, 11 Jun 2015 19:01:31 -0700
Subject: [PATCH 14/28] remove reference to original alumni network

---
 seed_data/field-guides.json | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json
index 61513d28c7..136433aab4 100644
--- a/seed_data/field-guides.json
+++ b/seed_data/field-guides.json
@@ -518,16 +518,6 @@
       "</div>"
     ]
   },
-  {
-    "_id": "bd7158d9c436eddfaeb5bd3e",
-    "name": "Does Free Code Camp have an alumni network?",
-    "dashedName": "does-free-code-camp-have-an-alumni-network",
-    "description": [
-      "<div class=\"col-xs-12 col-sm-10 col-sm-offset-1\">",
-      "  <h3>We have a growing <a href='https://www.linkedin.com/grp/home?gid=6966827' target='_blank'>alumni network on LinkedIn</a>. Once you've finished Free Code Camp and have gotten a coding job, we'd love to include you in this group, too!</h3>",
-      "</div>"
-    ]
-  },
   {
     "_id": "bd7158d9c442eddfaeb5bdef",
     "name": "How do I best use the Global Control Shortcuts for Mac?",

From 52b529fbdf031da8a53f4c39c1159ffdece21446 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Thu, 11 Jun 2015 23:21:50 -0400
Subject: [PATCH 15/28] rename generic test file

---
 test/{app.js => basic_routes.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/{app.js => basic_routes.js} (100%)

diff --git a/test/app.js b/test/basic_routes.js
similarity index 100%
rename from test/app.js
rename to test/basic_routes.js

From 3979dc42b9d611f6a2c96d03de022198262626e3 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Fri, 12 Jun 2015 11:59:07 -0700
Subject: [PATCH 16/28] start importing calculator

---
 app.js                          |   2 +
 controllers/resources.js        |   6 +
 views/resources/calculator.jade | 656 ++++++++++++++++++++++++++++++++
 3 files changed, 664 insertions(+)
 create mode 100644 views/resources/calculator.jade

diff --git a/app.js b/app.js
index a265e530de..1819529515 100755
--- a/app.js
+++ b/app.js
@@ -239,6 +239,8 @@ app.get('/chat', resourcesController.chat);
 
 app.get('/twitch', resourcesController.twitch);
 
+app.get('/calculator', resourcesController.calculator);
+
 app.get('/cats.json', function(req, res) {
   res.send(
     [
diff --git a/controllers/resources.js b/controllers/resources.js
index 0bf414954b..2b156dbbce 100644
--- a/controllers/resources.js
+++ b/controllers/resources.js
@@ -283,6 +283,12 @@ module.exports = {
     });
   },
 
+  calculator: function calculator(req, res) {
+    res.render('resources/calculator', {
+      title: "Coding Bootcamp Cost Calculator"
+    });
+  },
+
   unsubscribe: function unsubscribe(req, res, next) {
     User.findOne({ email: req.params.email }, function(err, user) {
       if (user) {
diff --git a/views/resources/calculator.jade b/views/resources/calculator.jade
new file mode 100644
index 0000000000..7db81dab2a
--- /dev/null
+++ b/views/resources/calculator.jade
@@ -0,0 +1,656 @@
+extends ../layout
+block content
+    .panel.panel-info
+        .panel-heading.text-center Coding Bootcamp Cost Calculator
+        .panel-body
+            .row
+                .col-xs-12.col-sm-10.col-sm-offset-1
+                    style.
+                        #lastYearIncome{
+                          clear:both;
+                          margin: 2% 0;
+                          width: 110px;
+                        }
+                        #income, #calculate {
+                          visibility:hidden;
+                        }
+                        .step {
+                          font-size: 2em;
+                          padding: 1%;
+                          clear: both;
+                        }
+                        .city-buttons {
+                          display: block;
+                          clear: right;
+                        }
+                        #four p{
+                          font-size: .6em;
+                          color: black;
+                        }
+                        .chart rect {
+                          fill: steelblue;
+                        }
+                        .chart text {
+                          fill: #121401;
+                          font: 10px sans-serif;
+                          text-anchor: end;
+                        }
+                        .axis path,
+                        .axis line {
+                          fill: none;
+                          stroke: #121401;
+                          stroke-width: 2px;
+                          shape-rendering: crispEdges;
+                        }
+                    html.
+                        <!--Live Logging for Testing-->
+                        <div id="target" class="step"></div>
+                        <div class="header">
+                        <!--Step 1-->
+                        <div id="one" class="step">Step 1: Choose your City</div>
+                        <div id="city-buttons">
+                        <ul>
+                        <li><span id="New York City">New York City</span></li>
+                        <li><span id="San Fransisco">San Fransisco</span></li>
+                        <li><span id="Austin">Austin</span></li>
+                        <li><span id="Los Angeles">Los Angeles</span></li>
+                        <li><span id="Chicago">Chicago</span></li>
+                        <li><span id="Other">Other</span></li>
+                        </ul>
+                        </div>
+                        &nbsp;
+                            <!--Step 2-->
+                            <div id="two" class="step">Step 2: Enter last Year's Income</div>
+                            <div id="income">
+                            <label>Last Years Income in $$:</label>
+                            <input type="number" placeholder="52000" class="form-control" id="lastYearIncome">
+                            </div>
+                            <!--Step 3-->
+                            <div id="three" class="step">Step 3: Calculate</div>
+                            <button id="calculate" type="submit" class="btn btn-default">Calculate</button>
+                            <!--Check Outputs Temp-->
+                            <!--Step 4-->
+                            <!--<div id="four" class="step">Clear the Chart and Start Over?</div>-->
+                            <svg class="chart"></svg>
+                        </div>
+                        <!--container-->
+                        <div class="footer">
+                        Sources: <a href="#">Link to Data Sources Here</a>
+                        <form>
+                            <label>
+                                <input type="radio" name="mode"
+                                       value="grouped">Grouped
+                            </label>
+                            <label>
+                                <input type="radio" name="mode"
+                                           value="stacked" checked>
+                                        Stacked
+                            </label>
+                        </form>
+                    script.
+                        $(document).ready(function () {
+                            var n = 4, // number of layers
+                                    m = 58, // number of samples per layer
+                                    stack = d3.layout.stack(),
+                                    layers = stack(d3.range(n).map(function () {
+                                        return bumpLayer(m, .1);
+                                    })),
+                                    yGroupMax = d3.max(layers, function (layer) {
+                                        return d3.max(layer, function (d) {
+                                            return d.y;
+                                        });
+                                    }),
+                                    yStackMax = d3.max(layers, function (layer) {
+                                        return d3.max(layer, function (d) {
+                                            return d.y0 + d.y;
+                                        });
+                                    });
+                            var margin = {
+                                        top: 40,
+                                        right: 10,
+                                        bottom: 20,
+                                        left: 10
+                                    },
+                                    width = 960 - margin.left - margin.right,
+                                    height = 500 - margin.top - margin.bottom;
+                            var x = d3.scale.ordinal()
+                                    .domain(d3.range(m))
+                                    .rangeRoundBands([0, width], .08);
+                            var y = d3.scale.linear()
+                                    .domain([0, yStackMax])
+                                    .range([height, 0]);
+                            var color = d3.scale.linear()
+                                    .domain([0, n - 1])
+                                    .range(["#aad", "#556"]);
+                            var xAxis = d3.svg.axis()
+                                    .scale(x)
+                                    .tickSize(0)
+                                    .tickPadding(6)
+                                    .orient("bottom");
+                            var svg = d3.select("body").append("svg")
+                                    .attr("width", width + margin.left + margin.right)
+                                    .attr("height", height + margin.top + margin.bottom)
+                                    .append("g")
+                                    .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+                            var layer = svg.selectAll(".layer")
+                                    .data(layers)
+                                    .enter().append("g")
+                                    .attr("class", "layer")
+                                    .style("fill", function (d, i) {
+                                        return color(i);
+                                    });
+                            var rect = layer.selectAll("rect")
+                                    .data(function (d) {
+                                        return d;
+                                    })
+                                    .enter().append("rect")
+                                    .attr("x", function (d) {
+                                        return x(d.x);
+                                    })
+                                    .attr("y", height)
+                                    .attr("width", x.rangeBand())
+                                    .attr("height", 0);
+                            rect.transition()
+                                    .delay(function (d, i) {
+                                        return i * 10;
+                                    })
+                                    .attr("y", function (d) {
+                                        return y(d.y0 + d.y);
+                                    })
+                                    .attr("height", function (d) {
+                                        return y(d.y0) - y(d.y0 + d.y);
+                                    });
+                            svg.append("g")
+                                    .attr("class", "x axis")
+                                    .attr("transform", "translate(0," + height + ")")
+                                    .call(xAxis);
+                            d3.selectAll("input").on("change", change);
+                            var timeout = setTimeout(function () {
+                                d3.select("input[value=\"grouped\"]").property("checked", true).each(change);
+                            }, 2000);
+
+                            function change() {
+                                clearTimeout(timeout);
+                                if (this.value === "grouped") transitionGrouped();
+                                else transitionStacked();
+                            }
+
+                            function transitionGrouped() {
+                                y.domain([0, yGroupMax]);
+                                rect.transition()
+                                        .duration(500)
+                                        .delay(function (d, i) {
+                                            return i * 10;
+                                        })
+                                        .attr("x", function (d, i, j) {
+                                            return x(d.x) + x.rangeBand() / n * j;
+                                        })
+                                        .attr("width", x.rangeBand() / n)
+                                        .transition()
+                                        .attr("y", function (d) {
+                                            return y(d.y);
+                                        })
+                                        .attr("height", function (d) {
+                                            return height - y(d.y);
+                                        });
+                            }
+
+                            function transitionStacked() {
+                                y.domain([0, yStackMax]);
+                                rect.transition()
+                                        .duration(500)
+                                        .delay(function (d, i) {
+                                            return i * 10;
+                                        })
+                                        .attr("y", function (d) {
+                                            return y(d.y0 + d.y);
+                                        })
+                                        .attr("height", function (d) {
+                                            return y(d.y0) - y(d.y0 + d.y);
+                                        })
+                                        .transition()
+                                        .attr("x", function (d) {
+                                            return x(d.x);
+                                        })
+                                        .attr("width", x.rangeBand());
+                            }
+
+                            // Inspired by Lee Byron's test data generator.
+                            function bumpLayer(n, o) {
+                                function bump(a) {
+                                    var x = 1 / (.1 + Math.random()),
+                                            y = 2 * Math.random() - .5,
+                                            z = 10 / (.1 + Math.random());
+                                    for (var i = 0; i < n; i++) {
+                                        var w = (i / n - y) * z;
+                                        a[i] += x * Math.exp(-w * w);
+                                    }
+                                }
+
+                                var a = [], i;
+                                for (i = 0; i < n; ++i) a[i] = o + o * Math.random();
+                                for (i = 0; i < 5; ++i) bump(a);
+                                return a.map(function (d, i) {
+                                    return {x: i, y: Math.max(0, d)};
+                                });
+                            }
+                            var city = "";
+                            var lastYearincome = 52000;
+                            //major cities array to check against users location for housing costs
+                            var cityArray = ["San Fransisco", "Los Angeles", "Chicago", "Austin", "New York City"];
+                            //this is the raw bootcamps file allowing easy addition of new code camps
+                            var bootcamps = [{
+                                "name": "App Academy",
+                                "cost": "18000",
+                                "weeks": "12",
+                                "finance": false,
+                                "cities": [
+                                    "New York",
+                                    "San Francisco"
+                                ]
+                            }, {
+                                "name": "Viking Code School",
+                                "cost": "18000",
+                                "weeks": "14",
+                                "finance": false,
+                                "cities": [
+                                    "online"
+                                ]
+                            }, {
+                                "name": "Hack Reactor",
+                                "cost": "17780",
+                                "weeks": "12",
+                                "finance": true,
+                                "cities": [
+                                    "New York",
+                                    "San Francisco"
+                                ]
+                            }, {
+                                "name": "Hackbright Academy",
+                                "cost": "15000",
+                                "weeks": "10",
+                                "finance": true,
+                                "cities": [
+                                    "San Francisco"
+                                ]
+                            }, {
+                                "name": "Dev Bootcamp",
+                                "cost": "13950",
+                                "finance": true,
+                                "weeks": "19",
+                                "cities": [
+                                    "New York",
+                                    "San Francisco",
+                                    "Chicago"
+                                ]
+                            }, {
+                                "name": "General Asssembly",
+                                "cost": "11500",
+                                "finance": true,
+                                "weeks": "12",
+                                "cities": [
+                                    "Washington, DC",
+                                    "Austin",
+                                    "Boston",
+                                    "Chicago",
+                                    "Hong Kong",
+                                    "London",
+                                    "Los Angeles",
+                                    "Melbourne",
+                                    "New York cities",
+                                    "San Francisco",
+                                    "Seattle",
+                                    "Singapore"
+                                ]
+                            }, {
+                                "name": "Angel Hack",
+                                "cost": "14250",
+                                "finance": true,
+                                "weeks": "12",
+                                "cities": [
+                                    "San Francisco"
+                                ]
+                            }, {
+                                "name": "Bitmaker Labs",
+                                "cost": "12000",
+                                "finance": true,
+                                "weeks": "12",
+                                "cities": [
+                                    "Toronto"
+                                ]
+                            }, {
+                                "name": "CoderVox",
+                                "cost": "9980",
+                                "finance": true,
+                                "weeks": "12",
+                                "cities": [
+                                    "Austin"
+                                ]
+                            }, {
+                                "name": "Coding Dojo",
+                                "cost": "12500",
+                                "finance": true,
+                                "weeks": "12",
+                                "cities": [
+                                    "New York",
+                                    "San Francisco",
+                                    "Chicago"
+                                ]
+                            }, {
+                                "name": "Epicodus",
+                                "cost": "4500",
+                                "finance": false,
+                                "weeks": "15",
+                                "cities": [
+                                    "Portland"
+                                ]
+                            }, {
+                                "name": "Flat Iron School",
+                                "cost": "15000",
+                                "finance": true,
+                                "weeks": "12",
+                                "cities": [
+                                    "New York"
+                                ]
+                            }, {
+                                "name": "Galvanize",
+                                "cost": "21000",
+                                "finance": true,
+                                "weeks": "24",
+                                "cities": [
+                                    "Boulder",
+                                    "Denver",
+                                    "Seattle",
+                                    "San Francisco",
+                                    "Fort Collins"
+                                ]
+                            }, {
+                                "name": "The Iron Yard",
+                                "cost": "12000",
+                                "finance": true,
+                                "weeks": "19",
+                                "cities": [
+                                    "Atlanta",
+                                    "Austin",
+                                    "Colombia, SC",
+                                    "Charleston, SC",
+                                    "Houston",
+                                    "Greenville, SC",
+                                    "Las Vegas",
+                                    "Little Rock",
+                                    "Nashville",
+                                    "Orlando",
+                                    "Raleigh - Durham",
+                                    "Tampa - St. Petersburg",
+                                    "Washington DC"
+                                ]
+                            }, {
+                                "name": "Launch Academy",
+                                "cost": "12500",
+                                "finance": true,
+                                "weeks": "10",
+                                "cities": [
+                                    "Boston"
+                                ]
+                            }, {
+                                "name": "Maker Square",
+                                "cost": "16920",
+                                "finance": true,
+                                "weeks": "12",
+                                "cities": [
+                                    "Los Angeles",
+                                    "San Francisco",
+                                    "Austin"
+                                ]
+                            }, {
+                                "name": "Refactor U",
+                                "cost": "13500",
+                                "finance": true,
+                                "weeks": "10",
+                                "cities": [
+                                    "Boulder"
+                                ]
+                            }, {
+                                "name": "Rocket U",
+                                "cost": "12500",
+                                "finance": true,
+                                "weeks": "12",
+                                "cities": [
+                                    "New York",
+                                    "San Francisco",
+                                    "Chicago"
+                                ]
+                            }, {
+                                "name": "Sabio",
+                                "cost": "13450",
+                                "finance": true,
+                                "weeks": "12",
+                                "cities": [
+                                    "Los Angeles"
+                                ]
+                            }, {
+                                "name": "Shillington School",
+                                "cost": "12950",
+                                "finance": true,
+                                "weeks": "12",
+                                "cities": [
+                                    "New York",
+                                    "Sydney",
+                                    "Brisbane",
+                                    "London",
+                                    "Manchester",
+                                    "Melbourne"
+                                ]
+                            }, {
+                                "name": "The Tech Academy",
+                                "cost": "9000",
+                                "finance": true,
+                                "weeks": "20",
+                                "cities": [
+                                    "Portland"
+                                ]
+                            }, {
+                                "name": "Turing School",
+                                "cost": "17500",
+                                "finance": true,
+                                "weeks": "27",
+                                "cities": [
+                                    "Denver"
+                                ]
+                            }, {
+                                "name": "Free Code Camp",
+                                "cost": "0",
+                                "finance": true,
+                                "weeks": "0",
+                                "cities": [
+                                    "Online"
+                                ]
+                            }];
+                            //reduce opacity for steps 2 through 4
+                            //the actual elements start out hidden via CSS
+                            $('#two').css({opacity: '0.25'});
+                            $('#three').css({opacity: '0.25'});
+                            $('#four').css({opacity: '0.25'});
+                            //step one event listener
+                            $('#city-buttons').on("click", "span", function () {
+                                $(this).addClass('animated tada');
+                                city = $(this).attr("id");
+                                //make next step visible
+                                $('#two').css({opacity: '1'});
+                                $('#income').css({visibility: 'visible'});
+                                //console.log(city);
+                            });
+                            //step two event listener
+                            $('#income').on("change", function () {
+                                console.log("Income Updated");
+                                lastYearincome = parseInt($('#lastYearIncome').val());
+                                //make next step visible
+                                $('#three').css({opacity: '1'});
+                                $('#calculate').css({visibility: 'visible'});
+                            });
+                            <!--Graph it-->
+                            $('#calculate').on("click", function () {
+                                //Make data logger visible
+                                $('#four').css({opacity: '1'});
+                                <!--Prep the data for D3 -->
+                                var categoryNames = ['Tuition', 'Finance', 'Housing', 'Working Cost'];
+                                bootcamps.forEach(function (camp) {
+                                    var x0 = 0;
+                                    //this just checks against main city array.
+                                    //when we refactor, this should check against this camp's cities array
+                                    //should not be a difficult change
+                                    if (cityArray.indexOf(city) >= 0) {
+                                        weeklyHousing = 0;
+                                    } else {
+                                        weeklyHousing = 500;
+                                    }
+                                    camp.mapping = [{
+                                        name: camp.name,
+                                        label: 'Tuition',
+                                        x0: x0,
+                                        x1: x0 += +camp.cost
+                                    }, {
+                                        name: camp.name,
+                                        label: 'Finance',
+                                        x0: +camp.cost,
+                                        x1: x0 += +Math.floor(camp.cost * .09519)
+                                    }, {
+                                        name: camp.name,
+                                        label: 'Housing',
+                                        x0: +Math.floor(camp.cost * 1.09519),
+                                        x1: x0 += weeklyHousing * camp.weeks
+                                    }, {
+                                        name: camp.name,
+                                        label: 'Working Cost',
+                                        x0: +(Math.floor(camp.cost * 1.09519) + weeklyHousing * camp.weeks),
+                                        x1: x0 += +(Math.floor(camp.weeks * lastYearincome / 50))
+                                    }];
+                                    camp.total = camp.mapping[camp.mapping.length - 1].x1;
+                                });
+                                console.log(bootcamps[0]);
+                                var margin = {
+                                            top: 30,
+                                            right: 60,
+                                            bottom: 50,
+                                            left: 140
+                                        },
+                                        width = 800 - margin.left - margin.right,
+                                        height = 600 - margin.top - margin.bottom;
+                                var barHeight = 20;
+                                var xScale = d3.scale.linear()
+                                        .domain([0, d3.max(bootcamps, function (d) {
+                                            return d.total;
+                                        })])
+                                        .rangeRound([0, width]);
+                                var yScale = d3.scale.ordinal()
+                                        .domain(bootcamps.map(function (d) {
+                                            return d.name;
+                                        }))
+                                        .rangeRoundBands([0, height], .1);
+                                console.log("yrangeroundband", yScale.rangeBand());
+                                var color = d3.scale.ordinal()
+                                        .range(["#f0ad4e", "#4A2B0F", "#215f1e", "#457E86"])
+                                        .domain(['Tuition', 'Finance', 'Housing', 'Working Cost']);
+                                var svg = d3.select("svg")
+                                        .attr("width", width + margin.left + margin.right)
+                                        .attr("height", height + margin.top + margin.bottom)
+                                        .append("g")
+                                        .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+                                var selection = svg.selectAll(".series")
+                                        .data(bootcamps)
+                                        .enter().append("g")
+                                        .attr("class", "series")
+                                        .attr("transform", function (d) {
+                                            return "translate(0," + yScale(d.name) + ")";
+                                        });
+                                ;
+                                selection.selectAll("rect")
+                                        .data(function (d) {
+                                            return d.mapping;
+                                        })
+                                        .enter().append("rect")
+                                        .attr("width", function (d) {
+                                            return xScale((d.x1) - (d.x0));
+                                        })
+                                        .attr("x", function (d) {
+                                            return xScale(d.x0);
+                                        })
+                                        .attr("height", yScale.rangeBand())
+                                        .style("fill", function (d) {
+                                            return color(d.label);
+                                        })
+                                        .style("stroke", "white")
+                                        .on("mouseover", function (d) {
+                                            showPopover.call(this, d);
+                                        })
+                                        .on("mouseout", function (d) {
+                                            removePopovers();
+                                        });
+                                //axes
+                                //axes
+                                var xAxis = d3.svg.axis()
+                                        .scale(xScale)
+                                        .orient("bottom");
+                                var yAxis = d3.svg.axis()
+                                        .scale(yScale)
+                                        .orient("left");
+                                svg.append("g")
+                                        .attr("class", "y axis")
+                                        .call(yAxis);
+                                svg.append("g")
+                                        .attr("class", "x axis")
+                                        .attr("transform", "translate(0," + height + ")")
+                                        .call(xAxis)
+                                        .append("text")
+                                        .attr("x", 300)
+                                        .attr("y", 35)
+                                        .attr("dy", ".35em")
+                                        .style("text-anchor", "middle")
+                                        .text("Cost in $USD");
+                                //tooltips
+                                function removePopovers() {
+                                    $('.popover').each(function () {
+                                        $(this).remove();
+                                    });
+                                }
+
+                                function showPopover(d) {
+                                    $(this).popover({
+                                        title: d.name,
+                                        placement: 'auto top',
+                                        container: 'body',
+                                        trigger: 'manual',
+                                        html: true,
+                                        content: function () {
+                                            return d.label +
+                                                    "<br/>$" +
+                                                    d3.format(",")(d.value ? d.value : d.x1 - d.x0);
+                                        }
+                                    });
+                                    $(this).popover('show')
+                                }
+
+                                //legends
+                                var legend = svg.selectAll(".legend")
+                                        .data(categoryNames.slice().reverse())
+                                        .enter().append("g")
+                                        .attr("class", "legend")
+                                        .attr("transform", function (d, i) {
+                                            return "translate(30," + i * yScale.rangeBand() * 1.1 + ")";
+                                        });
+                                legend.append("rect")
+                                        .attr("x", width - yScale.rangeBand())
+                                        .attr("width", yScale.rangeBand())
+                                        .attr("height", yScale.rangeBand())
+                                        .style("fill", color)
+                                        .style("stroke", "white");
+                                legend.append("text")
+                                        .attr("x", width - yScale.rangeBand() * 1.2)
+                                        .attr("y", 12)
+                                        .attr("dy", ".35em")
+                                        .style("text-anchor", "end")
+                                        .text(function (d) {
+                                            return d;
+                                        });
+                            });
+                        });

From e29a340afb4404e37d3d12fa2b0c776c7d4ac36e Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 12 Jun 2015 13:54:38 -0700
Subject: [PATCH 17/28] add blacklisted usernames to loopback user validations

---
 common/models/user.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/models/user.js b/common/models/user.js
index 0806d97e0b..1a577d0979 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -10,6 +10,12 @@ module.exports = function(User) {
   delete User.validations.email;
   // set salt factor for passwords
   User.settings.saltWorkFactor = 5;
+
+  User.validatesExclusionOf('username', {
+    inArray: blacklistedUsernames,
+    message: 'username is taken'
+  });
+
   debug('setting up user hooks');
   // send verification email to new camper
   User.afterRemote('create', function(ctx, user, next) {

From 90b2f99a704ae1be8b55ade7efeeeb1e2f6eacc2 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 12 Jun 2015 15:27:51 -0700
Subject: [PATCH 18/28] add create identities on flatten users

---
 package.json        |  1 +
 seed/flattenUser.js | 68 +++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 23c49e675c..6813f87726 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "mongodb": "^2.0.33",
     "morgan": "~1.5.0",
     "node-slack": "0.0.7",
+    "node-uuid": "^1.4.3",
     "nodemailer": "~1.3.0",
     "passport-facebook": "^2.0.0",
     "passport-google-oauth": "^0.2.0",
diff --git a/seed/flattenUser.js b/seed/flattenUser.js
index f919d6b471..3163349cf2 100644
--- a/seed/flattenUser.js
+++ b/seed/flattenUser.js
@@ -1,12 +1,21 @@
 /* eslint-disable no-process-exit */
 require('dotenv').load();
-var assign = require('lodash/object/assign'),
-    Rx = require('rx'),
+var Rx = require('rx'),
+    uuid = require('node-uuid'),
+    assign = require('lodash/object/assign'),
     mongodb = require('mongodb'),
     secrets = require('../config/secrets');
 
 var MongoClient = mongodb.MongoClient;
 
+var providers = [
+  'facebook',
+  'twitter',
+  'google',
+  'github',
+  'linkedin'
+];
+
 function createConnection(URI) {
   return Rx.Observable.create(function(observer) {
     MongoClient.connect(URI, function(err, database) {
@@ -48,6 +57,7 @@ function insertMany(db, collection, users, options) {
       if (err) {
         return observer.onError(err);
       }
+      observer.onNext();
       observer.onCompleted();
     });
   });
@@ -56,7 +66,8 @@ function insertMany(db, collection, users, options) {
 var count = 0;
 // will supply our db object
 var dbObservable = createConnection(secrets.db).shareReplay();
-dbObservable
+
+var users = dbObservable
   .flatMap(function(db) {
     // returns user document, n users per loop where n is the batchsize.
     return createQuery(db, 'users', {});
@@ -66,7 +77,17 @@ dbObservable
     assign(user, user.portfolio, user.profile);
     return user;
   })
-  // batch them into arrays of twenty documents
+  .map(function(user) {
+    if (user.username) {
+      return user;
+    }
+    user.username = 'fcc' + uuid.v4().slice(0, 8);
+    return user;
+  })
+  .shareReplay();
+
+// batch them into arrays of twenty documents
+var userSavesCount = users
   .bufferWithCount(20)
   // get bd object ready for insert
   .withLatestFrom(dbObservable, function(users, db) {
@@ -80,10 +101,45 @@ dbObservable
     return insertMany(dats.db, 'user', dats.users, { w: 1 });
   })
   // count how many times insert completes
-  .count()
+  .count();
+
+// create User Identities
+var userIdentityCount = users
+  .flatMap(function(user) {
+    var ids = providers
+      .map(function(provider) {
+        return {
+          provider: provider,
+          externalId: user[provider]
+        };
+      })
+      .filter(function(ident) {
+        return !!ident.externalId;
+      });
+
+    return Rx.Observable.from(ids);
+  })
+  .bufferWithCount(20)
+  .withLatestFrom(dbObservable, function(identities, db) {
+    return {
+      identities: identities,
+      db: db
+    };
+  })
+  .flatMap(function(dats) {
+    // bulk insert into new collection for loopback
+    return insertMany(dats.db, 'userIdentity', dats.identities, { w: 1 });
+  })
+  // count how many times insert completes
+  .count();
+
+Rx.Observable.merge(
+  userIdentityCount,
+  userSavesCount
+)
   .subscribe(
     function(_count) {
-      count = _count * 20;
+      count += _count * 20;
     },
     function(err) {
       console.log('an error occured', err);

From d07e5351ea66f505dcb4e42440f92d0f275e06e1 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Fri, 12 Jun 2015 18:55:47 -0400
Subject: [PATCH 19/28] Comment out blacklist

---
 common/models/user.js | 8 ++++----
 seed/flattenUser.js   | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/models/user.js b/common/models/user.js
index 1a577d0979..9f288d2514 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -11,10 +11,10 @@ module.exports = function(User) {
   // set salt factor for passwords
   User.settings.saltWorkFactor = 5;
 
-  User.validatesExclusionOf('username', {
-    inArray: blacklistedUsernames,
-    message: 'username is taken'
-  });
+  //User.validatesExclusionOf('username', {
+  //  inArray: blacklistedUsernames,
+  //  message: 'username is taken'
+  //});
 
   debug('setting up user hooks');
   // send verification email to new camper
diff --git a/seed/flattenUser.js b/seed/flattenUser.js
index 3163349cf2..64525b143d 100644
--- a/seed/flattenUser.js
+++ b/seed/flattenUser.js
@@ -36,11 +36,14 @@ function createQuery(db, collection, options, batchSize) {
     // or schedule getting next batch on nextTick
     cursor.each(function (err, doc) {
       if (err) {
+        console.log(err);
         return observer.onError(err);
       }
       if (!doc) {
+        console.log('hit complete');
         return observer.onCompleted();
       }
+      console.log('calling onnext');
       observer.onNext(doc);
     });
 
@@ -98,6 +101,7 @@ var userSavesCount = users
   })
   .flatMap(function(dats) {
     // bulk insert into new collection for loopback
+    console.log(dats);
     return insertMany(dats.db, 'user', dats.users, { w: 1 });
   })
   // count how many times insert completes
@@ -142,7 +146,7 @@ Rx.Observable.merge(
       count += _count * 20;
     },
     function(err) {
-      console.log('an error occured', err);
+      console.log('an error occured', err, err.stack);
     },
     function() {
       console.log('finished with %s documents processed', count);

From 5b2b7e23ae5d720b8a66ef1b91d6f02fb59584fb Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Fri, 12 Jun 2015 19:16:10 -0400
Subject: [PATCH 20/28] Take id property of username, remove wasteful save on
 profile lookup.

---
 common/models/user.json |  3 +--
 seed/flattenUser.js     |  3 ++-
 server/boot/user.js     | 10 +++-------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/common/models/user.json b/common/models/user.json
index ff0cab3495..df99af1651 100644
--- a/common/models/user.json
+++ b/common/models/user.json
@@ -44,8 +44,7 @@
     "username": {
       "type": "string",
       "lowercase": true,
-      "trim": true,
-      "id": true
+      "trim": true
     },
     "bio": {
       "type": "string",
diff --git a/seed/flattenUser.js b/seed/flattenUser.js
index 64525b143d..fad529cea3 100644
--- a/seed/flattenUser.js
+++ b/seed/flattenUser.js
@@ -114,7 +114,8 @@ var userIdentityCount = users
       .map(function(provider) {
         return {
           provider: provider,
-          externalId: user[provider]
+          externalId: user[provider],
+          userId: user.id
         };
       })
       .filter(function(ident) {
diff --git a/server/boot/user.js b/server/boot/user.js
index f5753c9b98..0e0dc09cdb 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -119,13 +119,15 @@ module.exports = function(app) {
   */
 
   function returnUser (req, res, next) {
+    debug(req.params.username);
     User.findOne(
-      { where: { username: req.params.username.toLowerCase() } },
+      { where: { 'username': req.params.username.toLowerCase() } },
       function(err, user) {
         if (err) {
           debug('Username err: ', err);
           return next(err);
         }
+        debug(user);
         if (user) {
           user.progressTimestamps =
             user.progressTimestamps.sort(function(a, b) {
@@ -184,11 +186,6 @@ module.exports = function(app) {
             user.currentStreak = 1;
           }
 
-          user.save(function(err) {
-            if (err) {
-              return next(err);
-            }
-
             var data = {};
             var progressTimestamps = user.progressTimestamps;
             progressTimestamps.forEach(function(timeStamp) {
@@ -234,7 +231,6 @@ module.exports = function(app) {
               currentStreak: user.currentStreak +
                 (user.currentStreak === 1 ? ' day' : ' days')
             });
-          });
         } else {
           req.flash('errors', {
             msg: "404: We couldn't find a page with that url. " +

From f6fbe6e9c750b4db0e33b2658fcfc2243a0f4dd0 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 12 Jun 2015 16:23:20 -0700
Subject: [PATCH 21/28] make username unique and make username required

---
 common/models/user.js   | 12 ++++++++----
 common/models/user.json |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/models/user.js b/common/models/user.js
index 9f288d2514..f8af5ed45a 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -11,10 +11,14 @@ module.exports = function(User) {
   // set salt factor for passwords
   User.settings.saltWorkFactor = 5;
 
-  //User.validatesExclusionOf('username', {
-  //  inArray: blacklistedUsernames,
-  //  message: 'username is taken'
-  //});
+  // username should not be in blacklist
+  User.validatesExclusionOf('username', {
+    'in': blacklistedUsernames,
+    message: 'is taken'
+  });
+
+  // username should be unique
+  User.validatesUniquenessOf('username');
 
   debug('setting up user hooks');
   // send verification email to new camper
diff --git a/common/models/user.json b/common/models/user.json
index df99af1651..a7caad6227 100644
--- a/common/models/user.json
+++ b/common/models/user.json
@@ -44,7 +44,8 @@
     "username": {
       "type": "string",
       "lowercase": true,
-      "trim": true
+      "trim": true,
+      "require": true
     },
     "bio": {
       "type": "string",

From af75452db5a11dcdfe53065e1d106306cf1f5b57 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Fri, 12 Jun 2015 21:09:12 -0400
Subject: [PATCH 22/28] Remove forcedomain so we can test beta website

---
 server/server.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/server.js b/server/server.js
index cce2ead0ac..bd1248878d 100755
--- a/server/server.js
+++ b/server/server.js
@@ -49,11 +49,11 @@ app.set('port', process.env.PORT || 3000);
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
-if (process.env.NODE_ENV === 'production') {
-  app.use(forceDomain({
-    hostname: 'www.freecodecamp.com'
-  }));
-}
+//if (process.env.NODE_ENV === 'production') {
+//  app.use(forceDomain({
+//    hostname: 'www.freecodecamp.com'
+//  }));
+//}
 
 app.use(compress());
 app.use(lessMiddleware(path.join(__dirname, '/public')));

From 320d84c3c1ed8c35cf68c36dad9dee6b30d821c2 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Fri, 12 Jun 2015 23:31:42 -0400
Subject: [PATCH 23/28] Make bower automatic, add gulp build task to build less
 file into css

---
 gulpfile.js  | 104 ++++++++++++++++++++++++++++-----------------------
 package.json |   4 +-
 2 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 4cb0341a96..51678484e0 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,16 +1,18 @@
 var gulp = require('gulp'),
-    debug = require('debug')('freecc:gulp'),
-    bower = require('bower-main-files'),
-    nodemon = require('gulp-nodemon'),
-    sync = require('browser-sync'),
-    reload = sync.reload,
-    inject = require('gulp-inject'),
-    reloadDelay = 1000,
-    eslint = require('gulp-eslint');
+  debug = require('debug')('freecc:gulp'),
+  bower = require('bower-main-files'),
+  nodemon = require('gulp-nodemon'),
+  sync = require('browser-sync'),
+  reload = sync.reload,
+  inject = require('gulp-inject'),
+  reloadDelay = 1000,
+  less = require('gulp-less'),
+  path = require('path'),
+  eslint = require('gulp-eslint');
 
 var paths = {
-    server: './server/server.js',
-    serverIgnore: []
+  server: './server/server.js',
+  serverIgnore: []
 };
 
 gulp.task('inject', function() {
@@ -22,50 +24,58 @@ gulp.task('inject', function() {
 });
 
 gulp.task('serve', function(cb) {
-    var called = false;
-    nodemon({
-        script: paths.server,
-        ext: '.js',
-        ignore: paths.serverIgnore,
-        env: {
-            'NODE_ENV': 'development',
-            'DEBUG': process.env.DEBUG || 'freecc:*'
-        }
+  var called = false;
+  nodemon({
+    script: paths.server,
+    ext: '.js',
+    ignore: paths.serverIgnore,
+    env: {
+      'NODE_ENV': 'development',
+      'DEBUG': process.env.DEBUG || 'freecc:*'
+    }
+  })
+    .on('start', function() {
+      if (!called) {
+        called = true;
+        setTimeout(function() {
+          cb();
+        }, reloadDelay);
+      }
     })
-        .on('start', function() {
-            if (!called) {
-                called = true;
-                setTimeout(function() {
-                    cb();
-                }, reloadDelay);
-            }
-        })
-        .on('restart', function(files) {
-            if (files) {
-                debug('Files that changes: ', files);
-            }
-            setTimeout(function() {
-                debug('Restarting browsers');
-                reload();
-            }, reloadDelay);
-        });
+    .on('restart', function(files) {
+      if (files) {
+        debug('Files that changes: ', files);
+      }
+      setTimeout(function() {
+        debug('Restarting browsers');
+        reload();
+      }, reloadDelay);
+    });
 });
 
 gulp.task('sync', ['serve'], function() {
-    sync.init(null, {
-      proxy: 'http://localhost:3000',
-      logLeval: 'debug',
-      files: ['public/js/lib/*/*.{js, jsx}'],
-      port: 3001,
-      open: false,
-      reloadDelay: reloadDelay
-    });
+  sync.init(null, {
+    proxy: 'http://localhost:3000',
+    logLeval: 'debug',
+    files: ['public/js/lib/*/*.{js, jsx}'],
+    port: 3001,
+    open: false,
+    reloadDelay: reloadDelay
+  });
 });
 
 gulp.task('lint', function() {
   return gulp.src(['public/js/lib/**/*'])
-  .pipe(eslint())
-  .pipe(eslint.format());
+    .pipe(eslint())
+    .pipe(eslint.format());
 });
 
-gulp.task('default', ['serve', 'sync']);
+gulp.task('build', function() {
+  return gulp.src('./public/css/*.less')
+    .pipe(less({
+      paths: [ path.join(__dirname, 'less', 'includes') ]
+    }))
+    .pipe(gulp.dest('./public/css/'));
+});
+
+gulp.task('default', ['build', 'serve', 'sync']);
diff --git a/package.json b/package.json
index 6813f87726..6cbc7a85a6 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,8 @@
   "scripts": {
     "start": "node server/server.js",
     "lint": "eslint --ext=.js,.jsx .",
-    "test": "mocha"
+    "test": "mocha",
+    "postinstall": "bower cache clean && bower install"
   },
   "license": "BSD-3-Clause",
   "contributors": [
@@ -50,6 +51,7 @@
     "forever": "~0.14.1",
     "frameguard": "^0.2.2",
     "github-api": "~0.7.0",
+    "gulp-less": "^3.0.3",
     "gulp-minify-css": "~0.5.1",
     "helmet": "~0.9.0",
     "helmet-csp": "^0.2.3",

From cb0485cb15c102de60ab5a13e1a6e7d3605f7622 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sat, 13 Jun 2015 13:42:59 -0700
Subject: [PATCH 24/28] update meta

---
 views/partials/meta.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/partials/meta.jade b/views/partials/meta.jade
index 236db82020..0909425c80 100644
--- a/views/partials/meta.jade
+++ b/views/partials/meta.jade
@@ -9,14 +9,14 @@ meta(property="og:site_name", content="Free Code Camp")
 meta(name='twitter:widgets:csp', content='on')
 meta(name='p:domain_verify', content='d0bc047a482c03c24f1168004c2a216a')
 meta(property="og:url", content="http://www.freecodecamp.com")
-meta(property="og:description", content="We're a community where you learn to code by helping nonprofits. Build your full stack JavaScript Portfolio today.")
+meta(property="og:description", content="Learn to code by helping nonprofits. Build your full stack web development portfolio today.")
 meta(property="og:image", content="https://s3.amazonaws.com/freecodecamp/curriculum-diagram-full.jpg")
 meta(property="og:type", content="article")
 meta(property="article:publisher", content="https://www.facebook.com/freecodecamp")
 meta(property="article:section", content="Responsive")
 link(rel="publisher", href="https://plus.google.com/+Freecodecamp")
 link(rel="author", href="https://plus.google.com/+Freecodecamp")
-meta(name="description", content="A community where you learn to code by helping nonprofits. Build your full stack JavaScript Portfolio today.")
+meta(name="description", content="Learn to code by helping nonprofits. Build your full stack web development portfolio today.")
 meta(name="twitter:creator", content="@freecodecamp")
 meta(name="twitter:url", content="http://www.freecodecamp.com")
 meta(name="twitter:site", content="@freecodecamp")

From 2c8a134e80ea86697f8bb0ce9dbf58739191b099 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sat, 13 Jun 2015 23:50:36 -0700
Subject: [PATCH 25/28] first challenge json file updated with dashedname

---
 seed/challenges/advanced-bonfires.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json
index d31921c7d8..e14504dba4 100644
--- a/seed/challenges/advanced-bonfires.json
+++ b/seed/challenges/advanced-bonfires.json
@@ -5,6 +5,7 @@
     {
       "id": "aff0395860f5d3034dc0bfc9",
       "name": "Bonfire: Validate US Telephone Numbers",
+      "dashedName": "bonfire-validate-us-telephone-numbers",
       "difficulty": "4.01",
       "description": [
         "Return true if the passed string is a valid US phone number",
@@ -65,6 +66,7 @@
     {
       "id": "a3f503de51cf954ede28891d",
       "name": "Bonfire: Symmetric Difference",
+      "dashedName": "bonfire-symmetric-difference",
       "difficulty": "4.02",
       "description": [
         "Create a function that takes two or more arrays and returns an array of the symmetric difference of the provided arrays.",
@@ -102,6 +104,7 @@
     {
       "id": "aa2e6f85cab2ab736c9a9b24",
       "name": "Bonfire: Exact Change",
+      "dashedName": "bonfire-exact-change",
       "difficulty": "4.03",
       "description": [
         "Design a cash register drawer function that accepts purchase price as the first argument, payment as the second argument, and cash-in-drawer (cid) as the third argument.",
@@ -157,6 +160,7 @@
     {
       "id": "a56138aff60341a09ed6c480",
       "name": "Bonfire: Inventory Update",
+      "dashedName": "bonfire-inventory-update",
       "difficulty": "4.04",
       "description": [
         "Compare and update inventory stored in a 2d array against a second 2d array of a fresh delivery. Update current inventory item quantity, and if an item cannot be found, add the new item and quantity into the inventory array in alphabetical order.",
@@ -211,6 +215,7 @@
     {
       "id": "a7bf700cd123b9a54eef01d5",
       "name": "Bonfire: No repeats please",
+      "dashedName": "bonfire-no-repeats-please",
       "difficulty": "4.05",
       "description": [
         "Return the number of total permutations of the provided string that don't have repeated consecutive letters.",
@@ -252,6 +257,7 @@
     {
       "id": "a19f0fbe1872186acd434d5a",
       "name": "Bonfire: Friendly Date Ranges",
+      "dashedName": "bonfire-friendly-date-ranges",
       "difficulty": "4.06",
       "description": [
         "Implement a way of converting two dates into a more friendly date range that could be presented to a user.",

From 2b7177e85667a6a1ad897d8d0e71f792660a3f9e Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sun, 14 Jun 2015 00:55:27 -0700
Subject: [PATCH 26/28] add dashedName attributes to JSON

---
 seed/challenges/basejumps.json                |  6 +++
 seed/challenges/basic-bonfires.json           | 40 ++++++++++++++-
 seed/challenges/basic-html5-and-css.json      | 49 ++++++++++++++++++-
 seed/challenges/basic-javascript.json         | 10 ++++
 seed/challenges/bootstrap.json                | 18 ++++++-
 seed/challenges/computer-science.json         |  6 +++
 seed/challenges/full-stack-javascript.json    | 11 +++++
 seed/challenges/functional-programming.json   |  1 +
 .../get-set-for-free-code-camp.json           |  8 +++
 seed/challenges/intermediate-bonfires.json    |  3 ++
 seed/challenges/jquery-ajax-and-json.json     |  5 ++
 .../object-oriented-javascript.json           |  9 ++++
 seed/challenges/ziplines.json                 | 11 ++++-
 13 files changed, 173 insertions(+), 4 deletions(-)

diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index 2b07de0333..71f3f3dcf8 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -5,6 +5,7 @@
     {
       "id": "bd7158d8c443eddfaeb5bcef",
       "name": "Waypoint: Get Set for Basejumps",
+      "dashedName": "waypoint-get-set-for-basejumps",
       "difficulty": 2.00,
       "challengeSeed": ["128451852"],
       "description": [
@@ -66,6 +67,7 @@
     {
       "id": "bd7158d8c443eddfaeb5bdef",
       "name": "Basejump: Build a Voting App",
+      "dashedName": "basejump-build-a-voting-app",
       "difficulty": 2.01,
       "challengeSeed": ["128451852"],
       "description": [
@@ -101,6 +103,7 @@
     {
       "id": "bd7158d8c443eddfaeb5bdff",
       "name": "Basejump: Build a Nightlife Coordination App",
+      "dashedName": "basejump-build-a-nightlife-coordination-app",
       "difficulty": 2.02,
       "challengeSeed": ["128451852"],
       "description": [
@@ -132,6 +135,7 @@
     {
       "id": "bd7158d8c443eddfaeb5bd0e",
       "name": "Basejump: Chart the Stock Market",
+      "dashedName": "basejump-chart-the-stock-market",
       "difficulty": 2.03,
       "challengeSeed": ["128451852"],
       "description": [
@@ -163,6 +167,7 @@
     {
       "id": "bd7158d8c443eddfaeb5bd0f",
       "name": "Basejump: Manage a Book Trading Club",
+      "dashedName": "basejump-manage-a-book-trading-club",
       "difficulty": 2.04,
       "challengeSeed": ["128451852"],
       "description": [
@@ -194,6 +199,7 @@
     {
       "id": "bd7158d8c443eddfaeb5bdee",
       "name": "Basejump: Build a Pinterest Clone",
+      "dashedName": "basejump-build-a-pinterest-clone",
       "difficulty": 2.05,
       "challengeSeed": ["128451852"],
       "description": [
diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index 998d46df23..a6cf5aebf4 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -5,6 +5,7 @@
     {
       "id": "bd7139d8c441eddfaeb5bdef",
       "name": "Waypoint: Pair Program on Bonfires",
+      "dashedName": "waypoint-pair-program-on-bonfires",
       "difficulty": 0.44,
       "challengeSeed": ["119657641"],
       "description": [
@@ -42,6 +43,7 @@
     {
       "id": "ad7123c8c441eddfaeb5bdef",
       "name": "Bonfire: Meet Bonfire",
+      "dashedName": "bonfire-meet-bonfire",
       "difficulty": "0",
       "description": [
         "Click the button below for further instructions.",
@@ -81,6 +83,7 @@
     {
       "id": "a202eed8fc186c8434cb6d61",
       "name": "Bonfire: Reverse a String",
+      "dashedName": "bonfire-reverse-a-string",
       "difficulty": "1.01",
       "tests": [
         "expect(reverseString('hello')).to.be.a('String');",
@@ -122,6 +125,7 @@
     {
       "id": "a302f7aae1aa3152a5b413bc",
       "name": "Bonfire: Factorialize a Number",
+      "dashedName": "bonfire-factorialize-a-number",
       "tests": [
         "expect(factorialize(5)).to.be.a(\"Number\");",
         "expect(factorialize(5)).to.equal(120);",
@@ -161,6 +165,7 @@
     {
       "id": "aaa48de84e1ecc7c742e1124",
       "name": "Bonfire: Check for Palindromes",
+      "dashedName": "bonfire-check-for-palindromes",
       "difficulty": "1.03",
       "description": [
         "Return true if the given string is a palindrome. Otherwise, return false.",
@@ -207,6 +212,7 @@
     {
       "id": "a26cbbe9ad8655a977e1ceb5",
       "name": "Bonfire: Find the Longest Word in a String",
+      "dashedName": "bonfire-find-the-longest-word-in-a-string",
       "difficulty": "1.04",
       "description": [
         "Return the length of the longest word in the provided sentence.",
@@ -246,6 +252,7 @@
     {
       "id": "ab6137d4e35944e21037b769",
       "name": "Bonfire: Title Case a Sentence",
+      "dashedName": "bonfire-title-case-a-sentence",
       "difficulty": "1.05",
       "description": [
         "Return the provided string with the first letter of each word capitalized.",
@@ -283,6 +290,7 @@
     {
       "id": "a789b3483989747d63b0e427",
       "name": "Bonfire: Return Largest Numbers in Arrays",
+      "dashedName": "bonfire-return-largest-numbers-in-arrays",
       "difficulty": "1.06",
       "description": [
         "Return an array consisting of the largest number from each provided sub-array. For simplicity, the provided array will contain exactly 4 sub-arrays.",
@@ -321,6 +329,7 @@
     {
       "id": "acda2fb1324d9b0fa741e6b5",
       "name": "Bonfire: Confirm the Ending",
+      "dashedName": "bonfire-confirm-the-ending",
       "difficulty": "1.07",
       "description": [
         "Check if a string (first argument) ends with the given target string (second argument).",
@@ -360,6 +369,7 @@
     {
       "id": "afcc8d540bea9ea2669306b6",
       "name": "Bonfire: Repeat a string repeat a string",
+      "dashedName": "bonfire-repeat-a-string-repeat-a-string",
       "difficulty": "1.08",
       "description": [
         "Repeat a given string (first argument) n times (second argument). Return an empty string if n is a negative number.",
@@ -396,6 +406,7 @@
     {
       "id": "ac6993d51946422351508a41",
       "name": "Bonfire: Truncate a string",
+      "dashedName": "bonfire-truncate-a-string",
       "difficulty": "1.09",
       "description": [
         "Truncate a string (first argument) if it is longer than the given maximum string length (second argument). Return the truncated string with a '...' ending.",
@@ -433,6 +444,7 @@
     {
       "id": "a9bd25c716030ec90084d8a1",
       "name": "Bonfire: Chunky Monkey",
+      "dashedName": "bonfire-chunky-monkey",
       "difficulty": "1.10",
       "description": [
         "Write a function that splits an array (first argument) into groups the length of size (second argument) and returns them as a multidimensional array.",
@@ -470,6 +482,7 @@
     {
       "id": "ab31c21b530c0dafa9e241ee",
       "name": "Bonfire: Slasher Flick",
+      "dashedName": "bonfire-slasher-flick",
       "difficulty": "1.11",
       "description": [
         "Return the remaining elements of an array after chopping off n elements from the head.",
@@ -507,6 +520,7 @@
     {
       "id": "af2170cad53daa0770fabdea",
       "name": "Bonfire: Mutations",
+      "dashedName": "bonfire-mutations",
       "difficulty": "1.12",
       "description": [
         "Return true if the string in the first element of the array contains all of the letters of the string in the second element of the array.",
@@ -549,6 +563,7 @@
     {
       "id": "adf08ec01beb4f99fc7a68f2",
       "name": "Bonfire: Falsey Bouncer",
+      "dashedName": "bonfire-falsey-bouncer",
       "difficulty": "1.50",
       "description": [
         "Remove all falsey values from an array.",
@@ -587,6 +602,7 @@
     {
       "id": "a8e512fbe388ac2f9198f0fa",
       "name": "Bonfire: Where art thou",
+      "dashedName": "bonfire-where-art-thou",
       "difficulty": "1.55",
       "description": [
         "Make a function that looks through a list (first argument) and returns an array of all objects that have equivalent property values (second argument).",
@@ -625,6 +641,7 @@
     {
       "id": "a39963a4c10bc8b4d4f06d7e",
       "name": "Bonfire: Seek and Destroy",
+      "dashedName": "bonfire-seek-and-destroy",
       "difficulty": "1.60",
       "description": [
         "You will be provided with an initial array (the first argument in the destroyer function), followed by one or more arguments. Remove all elements from the initial array that are of the same value as these arguments.",
@@ -661,6 +678,7 @@
     {
       "id": "a24c1a4622e3c05097f71d67",
       "name": "Bonfire: Where do I belong",
+      "dashedName": "bonfire-where-do-i-belong",
       "difficulty": "1.61",
       "description": [
         "Return the lowest index at which a value (second argument) should be inserted into a sorted array (first argument).",
@@ -697,6 +715,7 @@
     {
       "id": "a3566b1109230028080c9345",
       "name": "Bonfire: Sum All Numbers in a Range",
+      "dashedName": "bonfire-sum-all-numbers-in-a-range",
       "difficulty": "2.00",
       "description": [
         "We'll pass you an array of two numbers. Return the sum of those two numbers and all numbers between them.",
@@ -736,7 +755,8 @@
     },
     {
       "id": "a5de63ebea8dbee56860f4f2",
-      "name": "Bonfire: Diff Two Arrays",
+      "name": "bonfire-diff-two-arrays",
+      "dashedName": "Bonfire: Diff Two Arrays",
       "difficulty": "2.01",
       "description": [
         "Compare two arrays and return a new array with any items not found in both of the original arrays.",
@@ -782,6 +802,7 @@
     {
       "id": "a7f4d8f2483413a6ce226cac",
       "name": "Bonfire: Roman Numeral Converter",
+      "dashedName": "bonfire-roman-numeral-converter",
       "tests": [
         "expect(convert(12)).to.equal(\"XII\");",
         "expect(convert(5)).to.equal(\"V\");",
@@ -822,6 +843,7 @@
     {
       "id": "a0b5010f579e69b815e7c5d6",
       "name": "Bonfire: Search and Replace",
+      "dashedName": "bonfire-search-and-replace",
       "tests": [
         "expect(replace(\"Let us go to the store\", \"store\", \"mall\")).to.equal(\"Let us go to the mall\");",
         "expect(replace(\"He is Sleeping on the couch\", \"Sleeping\", \"sitting\")).to.equal(\"He is Sitting on the couch\");",
@@ -865,6 +887,7 @@
     {
       "id": "aa7697ea2477d1316795783b",
       "name": "Bonfire: Pig Latin",
+      "dashedName": "bonfire-pig-latin",
       "tests": [
         "expect(translate(\"california\")).to.equal(\"aliforniacay\");",
         "expect(translate(\"paragraphs\")).to.equal(\"aragraphspay\");",
@@ -908,6 +931,7 @@
     {
       "id": "afd15382cdfb22c9efe8b7de",
       "name": "Bonfire: DNA Pairing",
+      "dashedName": "bonfire-dna-pairing",
       "tests": [
         "assert.deepEqual(pair(\"ATCGA\"),[['A','T'],['T','A'],['C','G'],['G','C'],['A','T']], 'should return the dna pair');",
         "assert.deepEqual(pair(\"TTGAG\"),[['T','A'],['T','A'],['G','C'],['A','T'],['G','C']], 'should return the dna pair');",
@@ -946,6 +970,7 @@
     {
       "id": "af7588ade1100bde429baf20",
       "name": "Bonfire: Missing letters",
+      "dashedName": "bonfire-missing-letters",
       "difficulty": "2.05",
       "description": [
         "Find the missing letter in the passed letter range and return it.",
@@ -983,6 +1008,7 @@
     {
       "id": "a77dbc43c33f39daa4429b4f",
       "name": "Bonfire: Boo who",
+      "dashedName": "bonfire-boo-who",
       "difficulty": "2.06",
       "description": [
         "Check if a value is classified as a boolean primitive. Return true or false.",
@@ -1025,6 +1051,7 @@
     {
       "id": "a105e963526e7de52b219be9",
       "name": "Bonfire: Sorted Union",
+      "dashedName": "bonfire-sorted-union",
       "difficulty": "2.07",
       "description": [
         "Write a function that takes two or more arrays and returns a new array of unique values in the order of the original provided arrays.",
@@ -1062,6 +1089,7 @@
     {
       "id": "a6b0bb188d873cb2c8729495",
       "name": "Bonfire: Convert HTML Entities",
+      "dashedName": "bonfire-convert-html-entities",
       "difficulty": "2.07",
       "description": [
         "Convert the characters \"&\", \"<\", \">\", '\"', and \"'\", in a string to their corresponding HTML entities.",
@@ -1097,6 +1125,7 @@
     {
       "id": "a103376db3ba46b2d50db289",
       "name": "Bonfire: Spinal Tap Case",
+      "dashedName": "bonfire-spinal-tap-case",
       "difficulty": "2.08",
       "description": [
         "Convert a string to spinal case. Spinal case is all-lowercase-words-joined-by-dashes.",
@@ -1136,6 +1165,7 @@
     {
       "id": "a5229172f011153519423690",
       "name": "Bonfire: Sum All Odd Fibonacci Numbers",
+      "dashedName": "bonfire-sum-all-odd-fibonacci-numbers",
       "difficulty": "2.09",
       "description": [
         "Return the sum of all odd Fibonacci numbers up to and including the passed number if it is a Fibonacci number.",
@@ -1176,6 +1206,7 @@
     {
       "id": "a3bfc1673c0526e06d3ac698",
       "name": "Bonfire: Sum All Primes",
+      "dashedName": "bonfire-sum-all-primes",
       "difficulty": "2.10",
       "description": [
         "Sum all the prime numbers up to and including the provided number.",
@@ -1214,6 +1245,7 @@
     {
       "id": "ae9defd7acaf69703ab432ea",
       "name": "Bonfire: Smallest Common Multiple",
+      "dashedName": "bonfire-smallest-common-multiple",
       "difficulty": "2.11",
       "description": [
         "Find the smallest number that is evenly divisible by all numbers in the provided range.",
@@ -1252,6 +1284,7 @@
     {
       "id": "a6e40f1041b06c996f7b2406",
       "name": "Bonfire: Finders Keepers",
+      "dashedName": "bonfire-finders-keepers",
       "difficulty": "2.12",
       "description": [
         "Create a function that looks through an array (first argument) and returns the first element in the array that passes a truth test (second argument).",
@@ -1287,6 +1320,7 @@
     {
       "id": "a5deed1811a43193f9f1c841",
       "name": "Bonfire: Drop it",
+      "dashedName": "bonfire-drop-it",
       "difficulty": "2.13",
       "description": [
         "Drop the elements of an array (first argument), starting from the front, until the predicate (second argument) returns true.",
@@ -1324,6 +1358,7 @@
     {
       "id": "ab306dbdcc907c7ddfc30830",
       "name": "Bonfire: Steamroller",
+      "dashedName": "bonfire-steamroller",
       "difficulty": "2.14",
       "description": [
         "Flatten a nested array. You must account for varying levels of nesting.",
@@ -1360,6 +1395,7 @@
     {
       "id": "a8d97bd4c764e91f9d2bda01",
       "name": "Bonfire: Binary Agents",
+      "dashedName": "bonfire-binary-agents",
       "difficulty": "2.15",
       "description": [
         "Return an English translated sentence of the passed binary string.",
@@ -1396,6 +1432,7 @@
     {
       "id": "a10d2431ad0c6a099a4b8b52",
       "name": "Bonfire: Everything Be True",
+      "dashedName": "bonfire-everything-be-true",
       "difficulty": "2.21",
       "description": [
         "Check if the predicate (second argument) returns truthy (defined) for all elements of a collection (first argument).",
@@ -1434,6 +1471,7 @@
     {
       "id": "a97fd23d9b809dac9921074f",
       "name": "Bonfire: Arguments Optional",
+      "dashedName": "bonfire-arguments-optional",
       "difficulty": "2.22",
       "description": [
         "Create a function that sums two arguments together. If only one argument is provided, return a function that expects one additional argument and will return the sum.",
diff --git a/seed/challenges/basic-html5-and-css.json b/seed/challenges/basic-html5-and-css.json
index 6b8ef98def..3e0532d81a 100644
--- a/seed/challenges/basic-html5-and-css.json
+++ b/seed/challenges/basic-html5-and-css.json
@@ -5,6 +5,7 @@
     {
       "id": "bd7123c8c441eddfaeb5bdef",
       "name": "Waypoint: Say Hello to HTML Elements",
+      "dashedName": "waypoint-say-hello-to-html-elements",
       "difficulty": 0.0085,
       "description": [
         "Welcome to Free Code Camp's first coding challenge! Click on the button below for further instructions.",
@@ -44,6 +45,7 @@
     {
       "id": "bad87fee1348bd9aedf0887a",
       "name": "Waypoint: Headline with the h2 Element",
+      "dashedName": "waypoint-headline-with-the-h2-element",
       "difficulty": 0.010,
       "description": [
         "Add an <code>h2</code> tag that says \"CatPhotoApp\" to create a second HTML <code>element</code> below your \"Hello World\" <code>h1</code> element.",
@@ -80,6 +82,7 @@
     {
       "id": "bad87fee1348bd9aedf08801",
       "name": "Waypoint: Inform with the Paragraph Element",
+      "dashedName": "waypoint-inform-with-the-paragraph-element",
       "difficulty": 0.011,
       "description": [
         "Create a <code>p</code> element below your <code>h2</code> element, and give it the text \"Hello Paragraph\".",
@@ -114,6 +117,7 @@
     {
       "id": "bad87fee1348bd9aeaf08801",
       "name": "Waypoint: Visually Separate Elements with Line Breaks",
+      "dashedName": "waypoint-visually-separate-elements-with-line-breaks",
       "difficulty": 0.012,
       "description": [
         "Add a <code>br</code> element to your page, preferably between two of your elements.",
@@ -149,6 +153,7 @@
     {
       "id": "bad87fee1348bd9aedf08802",
       "name": "Waypoint: Uncomment HTML",
+      "dashedName": "waypoint-uncomment-html",
       "difficulty": 0.013,
       "description": [
         "Uncomment your <code>h1</code>, <code>h2</code> and <code>p</code> elements.",
@@ -193,6 +198,7 @@
     {
       "id": "bad87fee1348bd9aedf08804",
       "name": "Waypoint: Comment out HTML",
+      "dashedName": "waypoint-comment-out-html",
       "difficulty": 0.014,
       "description": [
         "Comment out your <code>h1</code> element and your <code>p</code> element, but leave your <code>h2</code> element uncommented.",
@@ -235,6 +241,7 @@
     {
       "id": "bad87fee1348bd9aedf08833",
       "name": "Waypoint: Fill in the Blank with Placeholder Text",
+      "dashedName": "waypoint-fill-in-the-blank-with-placeholder-text",
       "difficulty": 0.015,
       "description": [
         "Replace the text inside your <code>p</code> element with the first few words of the provided \"Kitty Ipsum\" text.",
@@ -276,6 +283,7 @@
     {
       "id": "bad87fed1348bd9aedf08833",
       "name": "Waypoint: Delete HTML Elements",
+      "dashedName": "waypoint-delete-html-elements",
       "difficulty": 0.016,
       "description": [
         "Delete your <code>h1</code> and <code>br</code> elements so we can simplify our view.",
@@ -316,6 +324,7 @@
     {
       "id": "bad87fee1348bd9aedf08803",
       "name": "Waypoint: Change the Color of Text",
+      "dashedName": "waypoint-change-the-color-of-text",
       "difficulty": 0.017,
       "description": [
         "Change your <code>h2</code> element's style so that its text color is red.",
@@ -351,6 +360,7 @@
     {
       "id": "bad87fee1348bd9aedf08805",
       "name": "Waypoint: Use CSS Selectors to Style Elements",
+      "dashedName": "waypoint-use-css-selectors-to-style-elements",
       "difficulty": 0.018,
       "description": [
         "Delete your <code>h2</code> element's style attribute and instead create a CSS <code>style</code> element. Add the necessary CSS to turn all <code>h2</code> elements blue.",
@@ -395,6 +405,7 @@
     {
       "id": "bad87fee1348bd9aecf08806",
       "name": "Waypoint: Use a CSS Class to Style an Element",
+      "dashedName": "waypoint-use-a-css-class-to-style-an-element",
       "difficulty": 0.019,
       "description": [
         "Create a CSS class called \"red-text\" and apply it to your <code>h2</code> element.",
@@ -436,6 +447,7 @@
     {
       "id": "bad87fee1348bd9aefe08806",
       "name": "Waypoint: Style Multiple Elements with a CSS Class",
+      "dashedName": "waypoint－style－multiple-elements-with-a-css-class",
       "difficulty": 0.020,
       "description": [
         "Apply the \"red-text\" class to your <code>h2</code> and <code>p</code> elements.",
@@ -474,6 +486,7 @@
     {
       "id": "bad87fee1348bd9aedf08806",
       "name": "Waypoint: Change the Font Size of an Element",
+      "dashedName": "waypoint-change-the-font-size-of-an-element",
       "difficulty": 0.021,
       "description": [
         "Create a second <code>p</code> element. Then, inside your <code>&#60;style&#62;</code> element, set the \"font-size\" of all <code>p</code> elements to 16 pixels.",
@@ -513,6 +526,7 @@
     {
       "id": "bad87fee1348bd9aede08807",
       "name": "Waypoint: Set the Font Family of an Element",
+      "dashedName": "waypoint-set-the-font-family-of-an-element",
       "difficulty": 0.022,
       "description": [
         "Make all of your <code>p</code> elements use the \"Monospace\" font.",
@@ -553,6 +567,7 @@
     {
       "id": "bad87fee1348bd9aedf08807",
       "name": "Waypoint: Import a Google Font",
+      "dashedName": "waypoint-import-a-google-font",
       "difficulty": 0.023,
       "description": [
         "Apply the <code>font-family</code> of \"Lobster\" to your <code>h2</code> element.",
@@ -598,6 +613,7 @@
     {
       "id": "bad87fee1348bd9aedf08808",
       "name": "Waypoint: Specify How Fonts Should Degrade",
+      "dashedName": "waypoint-specify-how-fonts-should-degrade",
       "difficulty": 0.024,
       "description": [
         "Make all your <code>h2</code> elements use \"Lobster\" as their font family, but degrade to the \"Monospace\" font when the \"Lobster\" font isn't available.",
@@ -647,6 +663,7 @@
     {
       "id": "bad87fee1348bd9aedf08809",
       "name": "Waypoint: Override Styles with Important",
+      "dashedName": "waypoint-override-styles-with-important",
       "difficulty": 0.025,
       "description": [
         "Create an \"urgently-red\" class that gives an element the font-color of red, but add <code>!important</code> to the class to ensure the element is rendered as being red. Immediately below your \"urgently-red\" class declaration, create a \"blue-text\" class that gives an element the font-color of blue. Apply both classes to your <code>h2</code> element.",
@@ -703,6 +720,7 @@
     {
       "id": "bad87fee1348bd9aedf08812",
       "name": "Waypoint: Add Images to your Website",
+      "dashedName": "waypoint-add-images-to-your-website",
       "difficulty": 0.026,
       "description": [
         "Use an <code>img</code> element to add the image <code>http://bit.ly/fcc-kittens</code> to your website.",
@@ -751,6 +769,7 @@
     {
       "id": "bad87fee1348bd9acdf08812",
       "name": "Waypoint: Size your Images",
+      "dashedName": "waypoint-size-your-images",
       "difficulty": 0.027,
       "description": [
         "Create a class called <code>smaller-image</code> and use it to resize the image so that it's only 100 pixels wide.",
@@ -800,6 +819,7 @@
     {
       "id": "bad87fee1348bd9bedf08813",
       "name": "Waypoint: Add Borders Around your Elements",
+      "dashedName": "waypoint-add-borders-around-your-elements",
       "difficulty": 0.028,
       "description": [
         "Create a class called \"thick-green-border\" that puts a 10-pixel-wide green border with a style of \"solid\" around an HTML element, and apply that class to your cat photo.",
@@ -856,6 +876,7 @@
     {
       "id": "bad87fee1348bd9aedf08814",
       "name": "Waypoint: Add Rounded Corners with a Border Radius",
+      "dashedName": "waypoint-add-rounded-corners-with-a-border-radius",
       "difficulty": 0.029,
       "description": [
         "Give your cat photo a <code>border-radius</code> of 10 pixels.",
@@ -915,6 +936,7 @@
     {
       "id": "bad87fee1348bd9aedf08815",
       "name": "Waypoint: Make Circular Images with a Border Radius",
+      "dashedName": "waypoint-make-circular-images-with-a-border-radius",
       "difficulty": 0.030,
       "description": [
         "Give your cat photo a <code>border-radius</code> of 50%.",
@@ -973,6 +995,7 @@
     {
       "id": "bad87fee1348bd9aedf08816",
       "name": "Waypoint: Link to External Pages with Anchor Elements",
+      "dashedName": "waypoint-link-to-external-pages-with-anchor-elements",
       "difficulty": 0.031,
       "description": [
         "Create an <code>a</code> element, or \"anchor element\", that links to http://catphotoapp.com and has \"cat photos\" as its link text, or \"anchor text\".",
@@ -1035,6 +1058,7 @@
     {
       "id": "bad87fee1348bd9aede08817",
       "name": "Waypoint: Wrap an Anchor Element within a Paragraph",
+      "dashedName": "waypoint-wrap-an-anchor-element-within-a-paragraph",
       "difficulty": 0.032,
       "description": [
         "Now wrap your <code>a</code> element within a new <code>p</code> element so that the surrounding paragraph says \"click here for cat photos\", but where only \"cat photos\" is a link - the rest is plain text.",
@@ -1103,6 +1127,7 @@
     {
       "id": "bad87fee1348bd9aedf08817",
       "name": "Waypoint: Make Dead Links using the Hash Symbol",
+      "dashedName": "waypoint-make-dead-links-using-the-hash-symbol",
       "difficulty": 0.033,
       "description": [
         "Use the hash symbol (#) to turn your <code>a</code> element's link into a dead link.",
@@ -1165,6 +1190,7 @@
     {
       "id": "bad87fee1348bd9aedf08820",
       "name": "Waypoint: Turn an Image into a Link",
+      "dashedName": "waypoint-turn-an-image-into-a-link",
       "difficulty": 0.034,
       "description": [
         "Wrap your <code>img</code> element inside an <code>a</code> element with a dead link.",
@@ -1230,6 +1256,7 @@
     {
       "id": "bad87fee1348bd9aedf08818",
       "name": "Waypoint: Add Alt Text to an Image for Accessibility",
+      "dashedName": "waypoint-add-alt-text-to-an-image-for-accessibility",
       "difficulty": 0.035,
       "description": [
         "Add an <code>alt</code> attribute with the text \"A cute orange cat lying on its back\" to our cat photo.",
@@ -1293,6 +1320,7 @@
     {
       "id": "bad87fee1348bd9aedf08827",
       "name": "Waypoint: Create a Bulleted Unordered List",
+      "dashedName": "waypoint-create-a-bulleted-unordered-list",
       "difficulty": 0.036,
       "description": [
         "Replace your <code>p</code> elements with an unordered list of three things that cats love.",
@@ -1358,6 +1386,7 @@
     {
       "id": "bad87fee1348bd9aedf08828",
       "name": "Waypoint: Create an Ordered List",
+      "dashedName": "waypoint-create-an-ordered-list",
       "difficulty": 0.037,
       "description": [
         "Create an ordered list of the top 3 things cats hate the most.",
@@ -1430,6 +1459,7 @@
     {
       "id": "bad87fee1348bd9aedf08829",
       "name": "Waypoint: Create a Text Field",
+      "dashedName": "waypoint-create-a-text-field",
       "difficulty": 0.038,
       "description": [
         "Now we'll create a web form. Create a text input under your lists.",
@@ -1501,6 +1531,7 @@
     {
       "id": "bad87fee1348bd9aedf08830",
       "name": "Waypoint: Add Placeholder Text to a Text Field",
+      "dashedName": "waypoint-add-placeholder-text-to-a-text-field",
       "difficulty": 0.039,
       "description": [
         "Set the <code>placeholder</code> value of your text <code>input</code> to \"cat photo URL\".",
@@ -1574,6 +1605,7 @@
     {
       "id": "bad87fee1348bd9aede08830",
       "name": "Waypoint: Create a Form Element",
+      "dashedName": "waypoint-create-a-form-element",
       "difficulty": 0.040,
       "description": [
         "Wrap your text field in a <code>form</code> element. Add the <code>action=\"/submit-cat-photo\"</code> attribute to this form element.",
@@ -1649,6 +1681,7 @@
     {
       "id": "bad87fee1348bd9aedd08830",
       "name": "Waypoint: Add a Submit Button to a Form",
+      "dashedName": "waypoint-add-a-submit-button-to-a-form",
       "difficulty": 0.041,
       "description": [
         "Add a submit button to your <code>form</code> element with type \"submit\" and \"Submit\" as its text.",
@@ -1725,7 +1758,8 @@
     },
     {
       "id": "bad87fee1348bd9aedc08830",
-      "name": "Waypoint: Use HTML5 to Require a Field",
+      "name": "waypoint-use-html5-to-require-a-field",
+      "dashedName": "Waypoint: Use HTML5 to Require a Field",
       "difficulty": 0.042,
       "description": [
         "Make your text <code>input</code> a \"required\" field, so that your user can't submit the form without completing this field.",
@@ -1801,6 +1835,7 @@
     {
       "id": "bad87fee1348bd9aedf08834",
       "name": "Waypoint: Create a Set of Radio Buttons",
+      "dashedName": "waypoint-create-a-set-of-radio-buttons",
       "difficulty": 0.043,
       "description": [
         "Add to your form a pair of radio buttons. Each radio button should be wrapped within its own <code>label</code> element. They should share a common <code>name</code> attribute. One should have the option of \"indoor\" and the other should have the option of \"outdoor\".",
@@ -1884,6 +1919,7 @@
     {
       "id": "bad87fee1348bd9aedf08835",
       "name": "Waypoint: Create a Set of Checkboxes",
+      "dashedName": "waypoint-create-a-set-of-checkboxes",
       "difficulty": 0.044,
       "description": [
         "Add to your form a set of three checkbox elements. Each checkbox should be wrapped within its own <code>label</code> element. All three should share the <code>name</code> attribute of \"personality\".",
@@ -1964,6 +2000,7 @@
     {
       "id": "bad87fee1348bd9aede18835",
       "name": "Waypoint: Clean up your form using Linebreaks",
+      "dashedName": "waypoint-clean-up-your-form-using-linebreaks",
       "difficulty": 0.045,
       "description": [
         "Clean up your form by adding linebreaks between form elements.",
@@ -2043,6 +2080,7 @@
     {
       "id": "bad87fee1348bd9aedd08835",
       "name": "Waypoint: Check Radio Buttons and Checkboxes by Default",
+      "dashedName": "waypoint-check-radio-buttons-and-checkboxes-by-default",
       "difficulty": 0.046,
       "description": [
         "Set the first of your radio buttons and the first of your checkboxes to both be checked by default.",
@@ -2126,6 +2164,7 @@
     {
       "id": "bad87fee1348bd9aede08835",
       "name": "Waypoint: Wrap Many Elements within a Single Div Element",
+      "dashedName": "waypoint-wrap-many-elements-within-a-single-div-element",
       "difficulty": 0.047,
       "description": [
         "Wrap your \"Things cats love\" and \"Things cats hate\" lists all within a single <code>div</code> element.",
@@ -2214,6 +2253,7 @@
     {
       "id": "bad87fee1348bd9aede07836",
       "name": "Waypoint: Give a Background Color to a Div Element",
+      "dashedName": "waypoint-give-a-background-color-to-a-div-element",
       "difficulty": 0.048,
       "description": [
         "Create a class called \"gray-background\" with the background color of gray. Assign this class to your <code>div</code> element.",
@@ -2300,6 +2340,7 @@
     {
       "id": "bad88fee1348bd9aedf08825",
       "name": "Waypoint: Adjusting the Padding of an Element",
+      "dashedName": "waypoint-adjusting-the-padding-of-an-element",
       "difficulty": 0.064,
       "description": [
         "These next few Waypoints will give you a brief tour of three important aspects of the space surrounding HTML elements: <code>padding</code>, <code>margin</code>, and <code>border</code>. Change the <code>padding</code> of your green box to match that of your red box.",
@@ -2361,6 +2402,7 @@
     {
       "id": "bad87fee1348bd9aedf08822",
       "name": "Waypoint: Adjust the Margin of an Element",
+      "dashedName": "waypoint-adjust-the-margin-of-an-element",
       "difficulty": 0.065,
       "description": [
         "Change the <code>margin</code> of the green box to match that of the red box.",
@@ -2424,6 +2466,7 @@
     {
       "id": "bad87fee1348bd9aedf08823",
       "name": "Waypoint: Add a Negative Margin to an Element",
+      "dashedName": "waypoint-add-a-negative-margin-to-an-element",
       "difficulty": 0.066,
       "description": [
         "Change the <code>margin</code> of the green box to a negative value, so it fills the entire horizontal width of the yellow box around it.",
@@ -2486,6 +2529,7 @@
     {
       "id": "bad87fee1348bd9aedf08824",
       "name": "Waypoint: Add Different Padding to Each Side of an Element",
+      "dashedName": "waypoint-add-different-padding-to-each-side-of-an-element",
       "difficulty": 0.067,
       "description": [
         "Give the green box a <code>padding</code> of 40 pixels on its top and left side, but only 20 pixels on its bottom and right side.",
@@ -2551,6 +2595,7 @@
     {
       "id": "bad87fee1248bd9aedf08824",
       "name": "Waypoint: Add Different Margins to Each Side of an Element",
+      "dashedName": "waypoint-add-different-margins-to-each-side-of-an-element",
       "difficulty": 0.068,
       "description": [
         "Give the green box a <code>margin</code> of 40 pixels on its top and left side, but only 20 pixels on its bottom and right side.",
@@ -2616,6 +2661,7 @@
     {
       "id": "bad87fee1348bd9aedf08826",
       "name": "Waypoint: Use Clockwise Notation to Specify the Padding of an Element",
+      "dashedName": "waypoint-use-clockwise-notation-to-specify-the-padding-of-an-element",
       "difficulty": 0.069,
       "description": [
         "Use Clockwise Notation to give the \".green-box\" class a <code>padding</code> of 40 pixels on its top and left side, but only 20 pixels on its bottom and right side.",
@@ -2678,6 +2724,7 @@
     {
       "id": "bad87fee1348bd9aedf08726",
       "name": "Waypoint: Use Clockwise Notation to Specify the Margin of an Element",
+      "dashedName": "waypoint-use-clockwise-notation-to-specify-the-margin-of-an-element",
       "difficulty": 0.070,
       "description": [
         "Let's try this again, but with <code>margin</code> this time. Use <code>Clockwise Notation</code> to give an element a margin of 40 pixels on its top and left side, but only 20 pixels on its bottom and right side.",
diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index 2de8349186..e7fe614659 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -5,6 +5,7 @@
     {
       "id": "bd7129d8c441eddfaeb5bdef",
       "name": "Waypoint: Build an Adventure Game",
+      "dashedName": "waypoint-build-an-adventure-game",
       "difficulty": 0.24,
       "challengeSeed": ["114604814"],
       "description": [
@@ -30,6 +31,7 @@
     {
       "id": "bd7130d8c441eddfaeb5bdef",
       "name": "Waypoint: Build Rock Paper Scissors",
+      "dashedName": "waypoint-build-rock-paper-scissors",
       "difficulty": 0.25,
       "challengeSeed": ["114604815"],
       "description": [
@@ -53,6 +55,7 @@
     {
       "id": "bd7131d8c441eddfaeb5bdef",
       "name": "Waypoint: Learn JavaScript For Loops",
+      "dashedName": "waypoint-learn-javascript-for-loops",
       "difficulty": 0.26,
       "challengeSeed": ["114614220"],
       "description": [
@@ -76,6 +79,7 @@
     {
       "id": "bd7132d8c441eddfaeb5bdef",
       "name": "Waypoint: Learn JavaScript While Loops",
+      "dashedName": "waypoint-learn-javascript-while-loops",
       "difficulty": 0.27,
       "challengeSeed": ["114612889"],
       "description": [
@@ -98,6 +102,7 @@
     {
       "id": "bd7133d8c441eddfaeb5bdef",
       "name": "Waypoint: Learn Control Flow",
+      "dashedName": "waypoint-learn-control-flow",
       "difficulty": 0.28,
       "challengeSeed": ["114612888"],
       "description": [
@@ -122,6 +127,7 @@
     {
       "id": "bd7134d8c441eddfaeb5bdef",
       "name": "Waypoint: Build a Contact List",
+      "dashedName": "waypoint-build-a-contact-list",
       "difficulty": 0.29,
       "challengeSeed": ["114612887"],
       "description": [
@@ -145,6 +151,7 @@
     {
       "id": "bd7135d8c441eddfaeb5bdef",
       "name": "Waypoint: Build an Address Book",
+      "dashedName": "waypoint-build-an-address-book",
       "difficulty": 0.30,
       "challengeSeed": ["114612885"],
       "description": [
@@ -168,6 +175,7 @@
     {
       "id": "bd7136d8c441eddfaeb5bdef",
       "name": "Waypoint: Build a Cash Register",
+      "dashedName": "waypoint-build-a-cash-register",
       "difficulty": 0.31,
       "challengeSeed": ["114612882"],
       "description": [
@@ -191,6 +199,7 @@
     {
       "id": "bd7118d8c441eddfaeb5bdef",
       "name": "Waypoint: Discover Chrome DevTools",
+      "dashedName": "waypoint-discover-chrome-devTools",
       "difficulty": 0.32,
       "challengeSeed": ["110752743"],
       "description": [
@@ -222,6 +231,7 @@
     {
       "id": "bd7138d8c441eddfaeb5bdef",
       "name": "Waypoint: Learn Regular Expressions",
+      "dashedName": "waypoint-learn-regular-expressions",
       "difficulty": 0.33,
       "challengeSeed": ["112547802"],
       "description": [
diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json
index 0f6b940b2f..eeac669f73 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -5,6 +5,7 @@
     {
       "id": "bad87fee1348bd9acde08812",
       "name": "Waypoint: Mobile Responsive Images",
+      "dashedName": "waypoint-mobile-responsive-images",
       "difficulty": 0.047,
       "description": [
         "Now let's go back to our Cat Photo App. This time, we'll style it using the popular Twitter Bootstrap responsive CSS framework. First, add a new image with the <code>src</code> attribute of \"http://bit.ly/fcc-kittens2\", and add the \"img-responsive\" Bootstrap class to that image.",
@@ -91,6 +92,7 @@
     {
       "id": "bad87fee1348bd8acde08812",
       "name": "Waypoint: Center Text with Bootstrap",
+      "dashedName": "waypoint-center-text-with-bootstrap",
       "difficulty": 0.048,
       "description": [
         "Add Bootstrap's \"text-center\" class to your <code>h2</code> element.",
@@ -174,6 +176,7 @@
     {
       "id": "bad87fee1348cd8acdf08812",
       "name": "Waypoint: Create a Bootstrap Button",
+      "dashedName": "waypoint-create-a-bootstrap-button",
       "difficulty": 0.049,
       "description": [
         "Create a new <code>button</code> element below your large kitten photo. Give it the class \"btn\" and the text of \"like this photo\".",
@@ -258,6 +261,7 @@
     {
       "id": "bad87fee1348cd8acef08812",
       "name": "Waypoint: Create a Block Element Bootstrap Button",
+      "dashedName": "waypoint-create-a-block-element-bootstrap-button",
       "difficulty": 0.050,
       "description": [
         "Add Bootstrap's \"btn-block\" class to your Bootstrap button.",
@@ -346,6 +350,7 @@
     {
       "id": "bad87fee1348cd8acef08811",
       "name": "Waypoint: Taste the Bootstrap Button Color Rainbow",
+      "dashedName": "waypoint-taste-the-bootstrap-button-color-rainbow",
       "difficulty": 0.051,
       "description": [
         "Add Bootstrap's \"btn-primary\" class to your button.",
@@ -432,6 +437,7 @@
     {
       "id": "bad87fee1348cd8acef08813",
       "name": "Waypoint: Call out Optional Actions with Button Info",
+      "dashedName": "waypoint-call-out-optional-actions-with-button-info",
       "difficulty": 0.052,
       "description": [
         "Create a new block-level Bootstrap button below your \"Like\" button with the text \"Info\", and add Bootstrap's \"btn-info\" and \"btn-block\" classes to it.",
@@ -519,6 +525,7 @@
     {
       "id": "bad87fee1348ce8acef08814",
       "name": "Waypoint: Warn your Users of a Dangerous Action",
+      "dashedName": "waypoint-warn-your-users-of-a-dangerous-action",
       "difficulty": 0.053,
       "description": [
         "Create a button with the text \"Delete\" and give it the class \"btn-danger\".",
@@ -607,6 +614,7 @@
     {
       "id": "bad88fee1348ce8acef08815",
       "name": "Waypoint: Use the Bootstrap Grid to Put Elements Side By Side",
+      "dashedName": "waypoint-use-the-bootstrap-grid-to-put-elements-side-by-side",
       "difficulty": 0.054,
       "description": [
         "Put the \"Like\", \"Info\" and \"Delete\" buttons side-by-side by wrapping all three of them within one <code>&#60;div class=\"row\"&#62;</code> element, then each of them within a <code>&#60;div class=\"col-xs-4\"&#62;</code> element.",
@@ -700,6 +708,7 @@
     {
       "id": "bad87fee1348bd9aedf08845",
       "name": "Waypoint: Ditch Custom CSS for Bootstrap",
+      "dashedName": "waypoint-ditch-custom-css-for-bootstrap",
       "difficulty": 0.055,
       "description": [
         "Delete the \".red-text\", \"p\", and \".smaller-image\" CSS declarations from your <code>style</code> element so that the only declarations left in your <code>style</code> element are \"h2\" and \"thick-green-border\". Then Delete the <code>p</code> element that contains a dead link. Then remove the \"red-text\" class from your <code>h2</code> element and replace it with the \"text-primary\" Bootstrap class. Finally, remove the \"smaller-image\" class from your first <code>img</code> element and replace it with the <code>img-responsive</code> class.",
@@ -799,6 +808,7 @@
     {
       "id": "bad87fee1348bd9aede08845",
       "name": "Waypoint: Create a Custom Heading",
+      "dashedName": "waypoint-create-a-custom-heading",
       "difficulty": 0.056,
       "description": [
         "Wrap your first image and your <code>h2</code> element within a single <code>&#60;div class='row'&#62;</code> element. Wrap your <code>h2</code> text within a <code>&#60;div class='col-xs-8'&#62;</code> and your image in a <code>&#60;div class='col-xs-4'&#62;</code> so that they are on the same line.",
@@ -888,6 +898,7 @@
     {
       "id": "bad87fee1348bd9aedd08845",
       "name": "Waypoint: Add Font Awesome Icons to our Buttons",
+      "dashedName": "waypoint-add-font-awesome-icons-to-our-buttons",
       "difficulty": 0.057,
       "description": [
         "Use Font Awesome to add a \"thumbs-up\" icon to your like button by giving it a <code>i</code> element with the classes \"fa\" and \"fa-thumbs-up\".",
@@ -974,7 +985,8 @@
     },
     {
       "id": "bad87fee1348bd9aedc08845",
-      "name": "Waypoint: Add Font Awesome Icons all of our Buttons",
+      "name": "Waypoint: Add Font Awesome Icons to all of our Buttons",
+      "dashedName": "waypoint-add-font-awesome-icons-to-all-of-our-Buttons",
       "difficulty": 0.058,
       "description": [
         "Use Font Awesome to add a \"info-circle\" icon to your info button and a \"trash\" icon to your delete button.",
@@ -1062,6 +1074,7 @@
     {
       "id": "bad87fee1348bd9aedb08845",
       "name": "Waypoint: Responsively Style Radio Buttons",
+      "dashedName": "waypoint-responsively-style-radio-buttons",
       "difficulty": 0.059,
       "description": [
         "Wrap all of your radio buttons within a <code>&#60;div class='row'&#62;</code> element. Then wrap each of them within a <code>&#60;div class='col-xs-6'&#62;</code> element.",
@@ -1148,6 +1161,7 @@
     {
       "id": "bad87fee1348bd9aeda08845",
       "name": "Waypoint: Responsively Style Checkboxes",
+      "dashedName": "waypoint-responsively-style-checkboxes",
       "difficulty": 0.060,
       "description": [
         "Wrap all your checkboxes in a <code>&#60;div class='row'&#62;</code> element. Then wrap each of them in a <code>&#60;div class='col-xs-4'&#62;</code> element.",
@@ -1241,6 +1255,7 @@
     {
       "id": "bad87fee1348bd9aed908845",
       "name": "Waypoint: Style Text Inputs as Form Controls",
+      "dashedName": "waypoint-style-text-inputs-as-form-controls",
       "difficulty": 0.061,
       "description": [
         "Give your form's text input field a class of \"form-control\". Give your form's submit button the classes \"btn btn-primary\". Also give this button the Font Awesome icon of \"fa-paper-plane\".",
@@ -1344,6 +1359,7 @@
     {
       "id": "bad87fee1348bd9aec908845",
       "name": "Waypoint: Line up Form Elements Responsively with Bootstrap",
+      "dashedName": "waypoint-line-up-form-elements-responsively-with-bootstrap",
       "difficulty": 0.062,
       "description": [
         "Now let's get your form <code>input</code> and your submission <code>button</code> on the same line. We'll do this the same way we have previously: by using a <code>div</code> element with the class \"row\", and other <code>div</code> elements within it using the \"col-xs-*\" class.",
diff --git a/seed/challenges/computer-science.json b/seed/challenges/computer-science.json
index 25d4565ebd..7f2a11b91d 100644
--- a/seed/challenges/computer-science.json
+++ b/seed/challenges/computer-science.json
@@ -5,6 +5,7 @@
     {
       "id": "bd7123d8c441eddfaeb5bdef",
       "name": "Waypoint: Learn Basic Computer Science",
+      "dashedName": "waypoint-learn-basic-computer-science",
       "difficulty": 0.90,
       "challengeSeed": ["114628241"],
       "description": [
@@ -34,6 +35,7 @@
     {
       "id": "bd8124d8c441eddfaeb5bdef",
       "name": "Waypoint: Learn Loops",
+      "dashedName": "waypoint-learn-loops",
       "difficulty": 0.19,
       "challengeSeed": ["114597348"],
       "description": [
@@ -61,6 +63,7 @@
     {
       "id": "bd8125d8c441eddfaeb5bdef",
       "name": "Waypoint: Learn Computer Hardware",
+      "dashedName": "waypoint-learn-computer-hardware",
       "difficulty": 0.20,
       "challengeSeed": ["114597347"],
       "description": [
@@ -88,6 +91,7 @@
     {
       "id": "bd8126d8c441eddfaeb5bdef",
       "name": "Waypoint: Learn Computer Networking",
+      "dashedName": "waypoint-learn-computer-networking",
       "difficulty": 0.21,
       "challengeSeed": ["114604811"],
       "description": [
@@ -115,6 +119,7 @@
     {
       "id": "bd8127d8c441eddfaeb5bdef",
       "name": "Waypoint: Learn Boolean Logic",
+      "dashedName": "waypoint-learn-boolean-logic",
       "difficulty": 0.22,
       "challengeSeed": ["114604812"],
       "description": [
@@ -142,6 +147,7 @@
     {
       "id": "bd8128d8c441eddfaeb5bdef",
       "name": "Waypoint: Learn Computer Security",
+      "dashedName": "waypoint-learn-computer-security",
       "difficulty": 0.23,
       "challengeSeed": ["114604813"],
       "description": [
diff --git a/seed/challenges/full-stack-javascript.json b/seed/challenges/full-stack-javascript.json
index 4a91042a8c..cbc08ba740 100644
--- a/seed/challenges/full-stack-javascript.json
+++ b/seed/challenges/full-stack-javascript.json
@@ -5,6 +5,7 @@
     {
       "id": "bd7154d8c441eddfaeb5bdef",
       "name": "Waypoint: Get Started with Angular.js",
+      "dashedName": "waypoint-get-started-with-angularjs",
       "difficulty": 0.34,
       "challengeSeed": ["114684726"],
       "description": [
@@ -28,6 +29,7 @@
     {
       "id": "bd7155d8c441eddfaeb5bdef",
       "name": "Waypoint: Apply Angular.js Directives",
+      "dashedName": "waypoint-apply-angularjs-directives",
       "difficulty": 0.35,
       "challengeSeed": ["114684727"],
       "description": [
@@ -51,6 +53,7 @@
     {
       "id": "bd7156d8c441eddfaeb5bdef",
       "name": "Waypoint: Power Forms with Angular.js",
+      "dashedName": "waypoint-power-forms-with-angularjs",
       "difficulty": 0.36,
       "challengeSeed": ["114684729"],
       "description": [
@@ -74,6 +77,7 @@
     {
       "id": "bd7157d8c441eddfaeb5bdef",
       "name": "Waypoint: Customize Angular.js Directives",
+      "dashedName": "waypoint-customize-angularjs-directives",
       "difficulty": 0.37,
       "challengeSeed": ["114685062"],
       "description": [
@@ -96,6 +100,7 @@
     {
       "id": "bd7158d8c441eddfaeb5bdef",
       "name": "Waypoint: Create Angular.js Services",
+      "dashedName": "waypoint-create-angularjs-services",
       "difficulty": 0.38,
       "challengeSeed": ["114685060"],
       "description": [
@@ -119,6 +124,7 @@
     {
       "id": "bd7153d8c441eddfaeb5bd0f",
       "name": "Waypoint: Manage Packages with NPM",
+      "dashedName": "waypoint-manage-packages-with-npm",
       "difficulty": 0.39,
       "challengeSeed": ["126433450"],
       "description": [
@@ -172,6 +178,7 @@
     {
       "id": "bd7153d8c441eddfaeb5bdff",
       "name": "Waypoint: Start a Node.js Server",
+      "dashedName": "waypoint-start-a-nodejs-server",
       "difficulty": 0.40,
       "challengeSeed": ["126411561"],
       "description": [
@@ -214,6 +221,7 @@
     {
       "id": "bd7153d8c441eddfaeb5bdfe",
       "name": "Waypoint: Continue working with Node.js Servers",
+      "dashedName": "waypoint-continue-working-with-nodejs-servers",
       "difficulty": 0.41,
       "challengeSeed": ["128836506"],
       "description": [
@@ -241,6 +249,7 @@
     {
       "id": "bd7153d8c441eddfaeb5bdfd",
       "name": "Waypoint: Finish working with Node.js Servers",
+      "dashedName": "waypoint-finish-working-with-nodejs-servers",
       "difficulty": 0.42,
       "challengeSeed": ["128836507"],
       "description": [
@@ -268,6 +277,7 @@
     {
       "id": "bd7153d8c441eddfaeb5bd1f",
       "name": "Waypoint: Build Web Apps with Express.js",
+      "dashedName": "waypoint-build-web-apps-with-expressjs",
       "difficulty": 0.43,
       "challengeSeed": ["126411559"],
       "description": [
@@ -309,6 +319,7 @@
     {
       "id": "bd7140d8c441eddfaeb5bdef",
       "name": "Waypoint: Manage Source Code with Git",
+      "dashedName": "waypoint-manage-source-code-with-git",
       "difficulty": 0.44,
       "challengeSeed": ["114635309"],
       "description": [
diff --git a/seed/challenges/functional-programming.json b/seed/challenges/functional-programming.json
index 868b626372..a7a60efdf9 100644
--- a/seed/challenges/functional-programming.json
+++ b/seed/challenges/functional-programming.json
@@ -5,6 +5,7 @@
     {
       "id": "bd7129d8c441eddfbeb5bddf",
       "name": "Waypoint: Practice Functional Programming",
+      "dashedName": "waypoint-practice-functional-programming",
       "difficulty": 0.01,
       "challengeSeed": ["129169463"],
       "description": [
diff --git a/seed/challenges/get-set-for-free-code-camp.json b/seed/challenges/get-set-for-free-code-camp.json
index 68d5c12e71..3a9d366102 100644
--- a/seed/challenges/get-set-for-free-code-camp.json
+++ b/seed/challenges/get-set-for-free-code-camp.json
@@ -5,6 +5,7 @@
     {
       "id": "bd7124d8c441eddfaeb5bdef",
       "name": "Waypoint: Learn how Free Code Camp Works",
+      "dashedName": "waypoint-learn-how-free-code-camp-works",
       "difficulty": 0.001,
       "challengeSeed": ["125407438"],
       "description": [
@@ -42,6 +43,7 @@
     {
       "id": "bd7125d8c441eddfaeb5bd0f",
       "name": "Waypoint: Join Our Chat Room",
+      "dashedName": "waypoint-join-our-chat-room",
       "difficulty": 0.002,
       "challengeSeed": ["124555254"],
       "description": [
@@ -83,6 +85,7 @@
     {
       "id": "bd7125d8c441eddfaeb5bdff",
       "name": "Waypoint: Preview our Challenge Map",
+      "dashedName": "waypoint-preview-our-challenge-map",
       "difficulty": 0.003,
       "challengeSeed": ["125407437"],
       "description": [
@@ -116,6 +119,7 @@
     {
       "id": "bd7125d8c441eddfaeb5bd1f",
       "name": "Waypoint: Browse our Field Guide",
+      "dashedName": "waypoint-browse-our-field-guide",
       "difficulty": 0.004,
       "challengeSeed": ["125407435"],
       "description": [
@@ -147,6 +151,7 @@
     {
       "id": "bd7125d8c441eddfaeb5bd2f",
       "name": "Waypoint: Customize your Portfolio Page",
+      "dashedName": "waypoint-customize-your-portfolio-page",
       "difficulty": 0.005,
       "challengeSeed": ["125407433"],
       "description": [
@@ -182,6 +187,7 @@
     {
       "id": "bd7126d8c441eddfaeb5bd3f",
       "name": "Waypoint: Try Camper News",
+      "dashedName": "waypoint-try-camper-news",
       "difficulty": 0.006,
       "challengeSeed": ["124553410"],
       "description": [
@@ -221,6 +227,7 @@
     {
       "id": "bd7126d8c441eddfaeb5bd3e",
       "name": "Waypoint: Meet Other Campers in your City",
+      "dashedName": "waypoint-meet-other-campers-in-your-city",
       "difficulty": 0.007,
       "challengeSeed": ["127358841"],
       "description": [
@@ -258,6 +265,7 @@
     {
       "id": "bd7137d8c441eddfaeb5bdef",
       "name": "Waypoint: Get Help the Hacker Way with RSAP",
+      "dashedName": "waypoint-get-help-the-hacker-way-with-rsap",
       "difficulty": 0.008,
       "challengeSeed": ["125407432"],
       "description": [
diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index 3c5bf35928..f0e25cb698 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -5,6 +5,7 @@
     {
       "id": "a2f1d72d9b908d0bd72bb9f6",
       "name": "Bonfire: Make a Person",
+      "dashedName": "bonfire-make-a-person",
       "difficulty": "3.01",
       "description": [
         "Fill in the object constructor with the methods specified in the tests.",
@@ -56,6 +57,7 @@
     {
       "id": "af4afb223120f7348cdfc9fd",
       "name": "Bonfire: Map the Debris",
+      "dashedName": "bonfire-map-the-debris",
       "difficulty": "3.02",
       "description": [
         "Return a new array that transforms the element's average altitude into their orbital periods.",
@@ -96,6 +98,7 @@
     {
       "id": "a3f503de51cfab748ff001aa",
       "name": "Bonfire: Pairwise",
+      "dashedName": "bonfire-pairwise",
       "difficulty": "3.03",
       "description": [
         "Return the sum of all indices of elements of 'arr' that can be paired with one other element to form a sum that equals the value in the second argument 'arg'. If multiple sums are possible, return the smallest sum. Once an element has been used, it cannot be reused to pair with another.",
diff --git a/seed/challenges/jquery-ajax-and-json.json b/seed/challenges/jquery-ajax-and-json.json
index a03cb7e7cb..e33edc39b6 100644
--- a/seed/challenges/jquery-ajax-and-json.json
+++ b/seed/challenges/jquery-ajax-and-json.json
@@ -5,6 +5,7 @@
     {
       "id": "bd7112d8c441eddfaeb5bded",
       "name": "Waypoint: Get Started with jQuery",
+      "dashedName": "waypoint-get-started-with-jquery",
       "difficulty": 0.13,
       "challengeSeed": ["125671865"],
       "description": [
@@ -30,6 +31,7 @@
     {
       "id": "bd7113d8c441eddfaeb5bdef",
       "name": "Waypoint: Write Functions with jQuery",
+      "dashedName": "waypoint-write-functions-with-jquery",
       "difficulty": 0.14,
       "challengeSeed": ["125658029"],
       "description": [
@@ -54,6 +56,7 @@
     {
       "id": "bd7114d8c441eddfaeb5bdef",
       "name": "Waypoint: Harness Dynamic HTML",
+      "dashedName": "waypoint-harness-dynamic-html",
       "difficulty": 0.15,
       "challengeSeed": ["125658028"],
       "description": [
@@ -77,6 +80,7 @@
     {
       "id": "bd7115d8c441eddfaeb5bdef",
       "name": "Waypoint: Listen for jQuery Events",
+      "dashedName": "waypoint-listen-for-jquery-events",
       "difficulty": 0.16,
       "challengeSeed": ["125658027"],
       "description": [
@@ -100,6 +104,7 @@
     {
       "id": "bd7116d8c441eddfaeb5bdef",
       "name": "Waypoint: Trigger jQuery Effects",
+      "dashedName": "waypoint-trigger-jquery-effects",
       "difficulty": 0.17,
       "challengeSeed": ["125658025"],
       "description": [
diff --git a/seed/challenges/object-oriented-javascript.json b/seed/challenges/object-oriented-javascript.json
index 75d0f83836..2817126e2f 100644
--- a/seed/challenges/object-oriented-javascript.json
+++ b/seed/challenges/object-oriented-javascript.json
@@ -5,6 +5,7 @@
     {
       "id": "bd7129d8c441eddfaeb5bddf",
       "name": "Waypoint: Scope Your Variables",
+      "dashedName": "waypoint-scope-your-variables",
       "difficulty": 0.01,
       "challengeSeed": ["128836683"],
       "description": [
@@ -31,6 +32,7 @@
     {
       "id": "bd7131d8c441eddfaeb5bdbf",
       "name": "Waypoint: Reference your Current Object with This",
+      "dashedName": "waypoint-reference-your-current-object-with-this",
       "difficulty": 0.03,
       "challengeSeed": ["128836508"],
       "description": [
@@ -57,6 +59,7 @@
     {
       "id": "bd7132d8c441eddfaeb5bdaf",
       "name": "Waypoint: Traverse the Prototype Chain",
+      "dashedName": "waypoint-traverse-the-prototype-chain",
       "difficulty": 0.04,
       "challengeSeed": ["128836684"],
       "description": [
@@ -82,6 +85,7 @@
     {
       "id": "bd7133d8c441eddfaeb5bd0f",
       "name": "Waypoint: Reuse Code with Decorators",
+      "dashedName": "waypoint-reuse-code-with-decorators",
       "difficulty": 0.05,
       "challengeSeed": ["128836681"],
       "description": [
@@ -108,6 +112,7 @@
     {
       "id": "bd7134d8c441eddfaeb5bd1f",
       "name": "Waypoint: Build Objects with Functional Classes",
+      "dashedName": "waypoint-build-objects-with-functional-classes",
       "difficulty": 0.06,
       "challengeSeed": ["128836503"],
       "description": [
@@ -134,6 +139,7 @@
     {
       "id": "bd7135d8c441eddfaeb5bd2f",
       "name": "Waypoint: Build Objects with Prototypal Classes",
+      "dashedName": "waypoint-build-objects-with-prototypal-classes",
       "difficulty": 0.07,
       "challengeSeed": ["128836505"],
       "description": [
@@ -160,6 +166,7 @@
     {
       "id": "bd7136d8c441eddfaeb5bd3f",
       "name": "Waypoint: Understand Pseudoclassical Patterns",
+      "dashedName": "waypoint-understand-pseudoclassical-patterns",
       "difficulty": 0.08,
       "challengeSeed": ["128836689"],
       "description": [
@@ -186,6 +193,7 @@
     {
       "id": "bd7136d8c441eddfaeb5bd4f",
       "name": "Waypoint: Subclass one Object to Another",
+      "dashedName": "waypoint-subclass-one-object-to-another",
       "difficulty": 0.09,
       "challengeSeed": ["128836686"],
       "description": [
@@ -211,6 +219,7 @@
     {
       "id": "bd7136d8c441eddfaeb5bd5f",
       "name": "Waypoint: Use Pseudoclassical Subclasses",
+      "dashedName": "waypoint-use-pseudoclassical-subclasses",
       "difficulty": 0.10,
       "challengeSeed": ["128836937"],
       "description": [
diff --git a/seed/challenges/ziplines.json b/seed/challenges/ziplines.json
index 4382f84e6c..f61a96280e 100644
--- a/seed/challenges/ziplines.json
+++ b/seed/challenges/ziplines.json
@@ -5,6 +5,7 @@
     {
       "id": "bd7158d8c442eddfbeb5bd1f",
       "name": "Waypoint: Get Set for Ziplines",
+      "dashedName": "waypoint-get-set-for-ziplines",
       "difficulty": 1.00,
       "challengeSeed": ["125658022"],
       "description": [
@@ -39,6 +40,7 @@
     {
       "id": "bd7158d8c442eddfaeb5bd1f",
       "name": "Zipline: Use the Twitch.tv JSON API",
+      "dashedName": "zipline-use-the-twitchtv-json-api",
       "difficulty": 1.01,
       "challengeSeed": ["126411564"],
       "description": [
@@ -74,6 +76,7 @@
     {
       "id": "bd7158d8c442eddfaeb5bd13",
       "name": "Zipline: Build a Random Quote Machine",
+      "dashedName": "zipline-build-a-random-quote-machine",
       "difficulty": 1.02,
       "challengeSeed": ["126415122"],
       "description": [
@@ -104,6 +107,7 @@
     {
       "id": "bd7158d8c442eddfaeb5bd10",
       "name": "Zipline: Show the Local Weather",
+      "dashedName": "zipline-show-the-local-weather",
       "difficulty": 1.03,
       "challengeSeed": ["126415127"],
       "description": [
@@ -136,6 +140,7 @@
     {
       "id": "bd7158d8c442eddfaeb5bd18",
       "name": "Zipline: Stylize Stories on Camper News",
+      "dashedName": "zipline-stylize-stories-on-camper-news",
       "difficulty": 1.04,
       "challengeSeed": ["126415129"],
       "description": [
@@ -168,7 +173,8 @@
     },
     {
       "id": "bd7158d8c442eddfaeb5bd19",
-      "name": "Zipline: Wikipedia Viewer",
+      "name": "zipline-wikipedia-viewer",
+      "dashedName": "Zipline: Wikipedia Viewer",
       "difficulty": 1.05,
       "challengeSeed": ["126415131"],
       "description": [
@@ -201,6 +207,7 @@
     {
       "id": "bd7158d8c442eddfaeb5bd0f",
       "name": "Zipline: Build a Pomodoro Clock",
+      "dashedName": "zipline-build-a-pomodoro-clock",
       "difficulty": 1.06,
       "challengeSeed": ["126411567"],
       "description": [
@@ -232,6 +239,7 @@
     {
       "id": "bd7158d8c442eddfaeb5bd17",
       "name": "Zipline: Build a JavaScript Calculator",
+      "dashedName": "zipline-build-a-javascript-calculator",
       "difficulty": 1.07,
       "challengeSeed": ["126411565"],
       "description": [
@@ -263,6 +271,7 @@
     {
       "id": "bd7158d8c442eddfaeb5bd1c",
       "name": "Zipline: Build a Tic Tac Toe Game",
+      "dashedName": "zipline-build-a-tic-tac-toe-game",
       "difficulty": 1.08,
       "challengeSeed": ["126415123"],
       "description": [

From b411426874630c8671346ed43e96f880d30659a0 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sun, 14 Jun 2015 00:56:47 -0700
Subject: [PATCH 27/28] add dashedName attribute to challenge

---
 common/models/challenge.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/models/challenge.json b/common/models/challenge.json
index aa6ef85ef3..dfc8c9c4a9 100644
--- a/common/models/challenge.json
+++ b/common/models/challenge.json
@@ -8,6 +8,9 @@
       "type": "string",
       "unique": true
     },
+    "dashedName": {
+      "type": "string"
+    },
     "difficulty": {
       "type": "string"
     },

From 40ce1d8162a25c54d9f83c85f42c1a57c17644a8 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Mon, 15 Jun 2015 08:01:43 -0400
Subject: [PATCH 28/28] Refactor to use dashedName for challenges in lookup.

---
 server/views/challengeMap/show.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade
index c72cffe37f..f77286eb4e 100644
--- a/server/views/challengeMap/show.jade
+++ b/server/views/challengeMap/show.jade
@@ -88,7 +88,7 @@ block content
                                             .hidden-xs.col-sm-3.col-md-2.text-primary.ion-checkmark-circled.padded-ionic-icon.text-center.large-p.negative-10
                                             .col-xs-12.col-sm-9.col-md-10
                                                 li.faded.large-p.negative-10
-                                                    a(href="/challenges/#{challenge.name}")= challenge.name
+                                                    a(href="/challenges/#{challenge.dashedName}")= challenge.name
 
                                     else
                                         .row
@@ -96,7 +96,7 @@ block content
                                                 span.negative-10
                                             .col-xs-12.col-sm-9.col-md-10
                                                 li.large-p.negative-10
-                                                    a(href="/challenges/#{challenge.name}")= challenge.name
+                                                    a(href="/challenges/#{challenge.dashedName}")= challenge.name
 
     #announcementModal.modal(tabindex='-1')
         .modal-dialog.animated.fadeInUp.fast-animation