diff --git a/README.md b/README.md
index 9b0c87d631..0611cd1816 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Our campers (students) start by working through our free, self-paced, browser-ba
 
 80% of our campers are over 25, and nearly a fifth of our campers are women.
 
-This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We also have [Gitter](https://gitter.im/FreeCodeCamp/FreeCodeCamp), a [blog](http://blog.freecodecamp.com), and even a [Twitch.tv channel](http://twitch.tv/freecodecamp).
+This code is running live at [FreeCodeCamp.com](http://www.FreeCodeCamp.com). We also have [Gitter](https://gitter.im/FreeCodeCamp/FreeCodeCamp), a [blog](http://medium.freecodecamp.com), and even a [Twitch.tv channel](http://twitch.tv/freecodecamp).
 
 [Join our community here](http://www.freecodecamp.com/signin).
 
@@ -54,22 +54,26 @@ The easiest way to get started is to clone the repository:
 # Get the latest snapshot
 git clone --depth=1 https://github.com/freecodecamp/freecodecamp.git freecodecamp
 
+# Change directory
 cd freecodecamp
 
 # Install NPM dependencies
 npm install
 
+# Install Gulp globally
+npm install -g gulp
+
+# Install Bower globally
+npm install -g bower
+
 # Install Bower dependencies
 bower install
 
 # Create a .env file and populate it with the necessary API keys and secrets:
 touch .env
-
-# Install Gulp globally
-npm install -g gulp
 ```
 
-Edit your `.env` file with the following API keys accordingly (if you only use email login, only the `MONGOHQ_URL`, `SESSION_SECRET`, `MANDRILL_USER` and `MANDRILL_PASSWORD` fields are necessary. Keep in mind if you want to use more services you'll have to get your own API keys for those services.
+Edit your `.env` file with the following API keys accordingly. If you only use email login, only the `MONGOHQ_URL`, `SESSION_SECRET`, `MANDRILL_USER` and `MANDRILL_PASSWORD` fields are necessary. Keep in mind if you want to use more services you'll have to get your own API keys for those services. If you only use a subset or no OAuth2 authentication methods, you may want to remove them from ```server/passport-providers.js``` - otherwise the server will complain about missing clientIDs at launch.
 
 ```
 MONGOHQ_URL='mongodb://localhost:27017/freecodecamp'
@@ -107,20 +111,20 @@ DEBUG=true
 ```
 
 ```bash
-# Start the mongo server
+# Start the mongo server in a seperate terminal
 mongod
 
-# Create your mongo database.
-# Type "mongo" in your terminal to access the mongo shell
-use freecodecamp
-# Exit the mongo shell with control + d
-
-# Seed your database with the challenges
-node seed/
+# Initialize Free Code Camp
+# This will seed the database for the first time.
+# This command should only be run once.
+npm run first-time
 
 # start the application
 gulp
 ```
+Now navigate to your browser and open http://localhost:3001
+If the app loads, congratulations - you're all set. Otherwise, let us know by opening a GitHub issue and with your error.
+
 
 License
 -------
diff --git a/client/commonFramework.js b/client/commonFramework.js
index a28a1e743d..2505fe08f4 100644
--- a/client/commonFramework.js
+++ b/client/commonFramework.js
@@ -374,8 +374,9 @@ var editor = (function(CodeMirror, emmetCodeMirror, common) {
   }
 
   var editor = CodeMirror.fromTextArea(document.getElementById('codeEditor'), {
+    lint: true,
     lineNumbers: true,
-    mode: 'text',
+    mode: 'javascript',
     theme: 'monokai',
     runnable: true,
     matchBrackets: true,
@@ -529,6 +530,20 @@ function safeHTMLRun(test) {
         // add feuxQuery
       s = 'var document = \"\"; var $ = function() {return(new function() {this.add=function() {return(this);};this.addBack=function() {return(this);};this.addClass=function() {return(this);};this.after=function() {return(this);};this.ajaxComplete=function() {return(this);};this.ajaxError=function() {return(this);};this.ajaxSend=function() {return(this);};this.ajaxStart=function() {return(this);};this.ajaxStop=function() {return(this);};this.ajaxSuccess=function() {return(this);};this.andSelf=function() {return(this);};this.animate=function() {return(this);};this.append=function() {return(this);};this.appendTo=function() {return(this);};this.attr=function() {return(this);};this.before=function() {return(this);};this.bind=function() {return(this);};this.blur=function() {return(this);};this.callbacksadd=function() {return(this);};this.callbacksdisable=function() {return(this);};this.callbacksdisabled=function() {return(this);};this.callbacksempty=function() {return(this);};this.callbacksfire=function() {return(this);};this.callbacksfired=function() {return(this);};this.callbacksfireWith=function() {return(this);};this.callbackshas=function() {return(this);};this.callbackslock=function() {return(this);};this.callbackslocked=function() {return(this);};this.callbacksremove=function() {return(this);};this.change=function() {return(this);};this.children=function() {return(this);};this.clearQueue=function() {return(this);};this.click=function() {return(this);};this.clone=function() {return(this);};this.closest=function() {return(this);};this.contents=function() {return(this);};this.context=function() {return(this);};this.css=function() {return(this);};this.data=function() {return(this);};this.dblclick=function() {return(this);};this.delay=function() {return(this);};this.delegate=function() {return(this);};this.dequeue=function() {return(this);};this.detach=function() {return(this);};this.die=function() {return(this);};this.each=function() {return(this);};this.empty=function() {return(this);};this.end=function() {return(this);};this.eq=function() {return(this);};this.error=function() {return(this);};this.fadeIn=function() {return(this);};this.fadeOut=function() {return(this);};this.fadeTo=function() {return(this);};this.fadeToggle=function() {return(this);};this.filter=function() {return(this);};this.find=function() {return(this);};this.finish=function() {return(this);};this.first=function() {return(this);};this.focus=function() {return(this);};this.focusin=function() {return(this);};this.focusout=function() {return(this);};this.get=function() {return(this);};this.has=function() {return(this);};this.hasClass=function() {return(this);};this.height=function() {return(this);};this.hide=function() {return(this);};this.hover=function() {return(this);};this.html=function() {return(this);};this.index=function() {return(this);};this.innerHeight=function() {return(this);};this.innerWidth=function() {return(this);};this.insertAfter=function() {return(this);};this.insertBefore=function() {return(this);};this.is=function() {return(this);};this.jQuery=function() {return(this);};this.jquery=function() {return(this);};this.keydown=function() {return(this);};this.keypress=function() {return(this);};this.keyup=function() {return(this);};this.last=function() {return(this);};this.length=function() {return(this);};this.live=function() {return(this);};this.load=function() {return(this);};this.load=function() {return(this);};this.map=function() {return(this);};this.mousedown=function() {return(this);};this.mouseenter=function() {return(this);};this.mouseleave=function() {return(this);};this.mousemove=function() {return(this);};this.mouseout=function() {return(this);};this.mouseover=function() {return(this);};this.mouseup=function() {return(this);};this.next=function() {return(this);};this.nextAll=function() {return(this);};this.nextUntil=function() {return(this);};this.not=function() {return(this);};this.off=function() {return(this);};this.offset=function() {return(this);};this.offsetParent=function() {return(this);};this.on=function() {return(this);};this.one=function() {return(this);};this.outerHeight=function() {return(this);};this.outerWidth=function() {return(this);};this.parent=function() {return(this);};this.parents=function() {return(this);};this.parentsUntil=function() {return(this);};this.position=function() {return(this);};this.prepend=function() {return(this);};this.prependTo=function() {return(this);};this.prev=function() {return(this);};this.prevAll=function() {return(this);};this.prevUntil=function() {return(this);};this.promise=function() {return(this);};this.prop=function() {return(this);};this.pushStack=function() {return(this);};this.queue=function() {return(this);};this.ready=function() {return(this);};this.remove=function() {return(this);};this.removeAttr=function() {return(this);};this.removeClass=function() {return(this);};this.removeData=function() {return(this);};this.removeProp=function() {return(this);};this.replaceAll=function() {return(this);};this.replaceWith=function() {return(this);};this.resize=function() {return(this);};this.scroll=function() {return(this);};this.scrollLeft=function() {return(this);};this.scrollTop=function() {return(this);};this.select=function() {return(this);};this.selector=function() {return(this);};this.serialize=function() {return(this);};this.serializeArray=function() {return(this);};this.show=function() {return(this);};this.siblings=function() {return(this);};this.size=function() {return(this);};this.slice=function() {return(this);};this.slideDown=function() {return(this);};this.slideToggle=function() {return(this);};this.slideUp=function() {return(this);};this.stop=function() {return(this);};this.submit=function() {return(this);};this.text=function() {return(this);};this.toArray=function() {return(this);};this.toggle=function() {return(this);};this.toggle=function() {return(this);};this.toggleClass=function() {return(this);};this.trigger=function() {return(this);};this.triggerHandler=function() {return(this);};this.unbind=function() {return(this);};this.undelegate=function() {return(this);};this.unload=function() {return(this);};this.unwrap=function() {return(this);};this.val=function() {return(this);};this.width=function() {return(this);};this.wrap=function() {return(this);};this.wrapAll=function() {return(this);};this.wrapInner=function() {return(this);}});};$.ajax=function() {return($);};$.ajaxPrefilter=function() {return($);};$.ajaxSetup=function() {return($);};$.ajaxTransport=function() {return($);};$.boxModel=function() {return($);};$.browser=function() {return($);};$.Callbacks=function() {return($);};$.contains=function() {return($);};$.cssHooks=function() {return($);};$.cssNumber=function() {return($);};$.data=function() {return($);};$.Deferred=function() {return($);};$.dequeue=function() {return($);};$.each=function() {return($);};$.error=function() {return($);};$.extend=function() {return($);};$.fnextend=function() {return($);};$.fxinterval=function() {return($);};$.fxoff=function() {return($);};$.get=function() {return($);};$.getJSON=function() {return($);};$.getScript=function() {return($);};$.globalEval=function() {return($);};$.grep=function() {return($);};$.hasData=function() {return($);};$.holdReady=function() {return($);};$.inArray=function() {return($);};$.isArray=function() {return($);};$.isEmptyObject=function() {return($);};$.isFunction=function() {return($);};$.isNumeric=function() {return($);};$.isPlainObject=function() {return($);};$.isWindow=function() {return($);};$.isXMLDoc=function() {return($);};$.makeArray=function() {return($);};$.map=function() {return($);};$.merge=function() {return($);};$.noConflict=function() {return($);};$.noop=function() {return($);};$.now=function() {return($);};$.param=function() {return($);};$.parseHTML=function() {return($);};$.parseJSON=function() {return($);};$.parseXML=function() {return($);};$.post=function() {return($);};$.proxy=function() {return($);};$.queue=function() {return($);};$.removeData=function() {return($);};$.sub=function() {return($);};$.support=function() {return($);};$.trim=function() {return($);};$.type=function() {return($);};$.unique=function() {return($);};$.when=function() {return($);};$.always=function() {return($);};$.done=function() {return($);};$.fail=function() {return($);};$.isRejected=function() {return($);};$.isResolved=function() {return($);};$.notify=function() {return($);};$.notifyWith=function() {return($);};$.pipe=function() {return($);};$.progress=function() {return($);};$.promise=function() {return($);};$.reject=function() {return($);};$.rejectWith=function() {return($);};$.resolve=function() {return($);};$.resolveWith=function() {return($);};$.state=function() {return($);};$.then=function() {return($);};$.currentTarget=function() {return($);};$.data=function() {return($);};$.delegateTarget=function() {return($);};$.isDefaultPrevented=function() {return($);};$.isImmediatePropagationStopped=function() {return($);};$.isPropagationStopped=function() {return($);};$.metaKey=function() {return($);};$.namespace=function() {return($);};$.pageX=function() {return($);};$.pageY=function() {return($);};$.preventDefault=function() {return($);};$.relatedTarget=function() {return($);};$.result=function() {return($);};$.stopImmediatePropagation=function() {return($);};$.stopPropagation=function() {return($);};$.target=function() {return($);};$.timeStamp=function() {return($);};$.type=function() {return($);};$.which=function() {return($);};' + s;
 
+        // add spoofigator
+
+      s = " var navigator = " +
+        "function(){" +
+        "  this.geolocation=function(){" +
+        "    this.getCurrentPosition=function(){" +
+        "      this.coords = {latitude: \"\", longitude: \"\"};" +
+        "      return(this);" +
+        "    };" +
+        "    return(this);" +
+        "  };" +
+        "  return(this);" +
+        "};" + s;
+
       sandBox.submit(scopejQuery(s), function(cls, message) {
         if (cls) {
           console.log(message.error);
diff --git a/client/less/chat.less b/client/less/chat.less
new file mode 100644
index 0000000000..a6f83171ca
--- /dev/null
+++ b/client/less/chat.less
@@ -0,0 +1,24 @@
+.chat-embed-main-title {
+  display: flex;
+  flex-grow: 1;
+  padding-left: 31px;
+  padding-top: 7px;
+}
+
+.gitter-chat-embed {
+  z-index: 100;
+  position: fixed;
+
+  top: 0;
+  left: 60%;
+  bottom: 0;
+  right: 0;
+
+  display: flex;
+  flex-direction: row;
+  transition: transform 0.3s cubic-bezier(0.16, 0.22, 0.22, 1.7);
+}
+
+.gitter-chat-embed.is-collapsed:not(.is-loading) {
+  transform: translateX(110%);
+}
diff --git a/client/less/main.less b/client/less/main.less
index 4340350da7..aa70867894 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -96,6 +96,10 @@ h1, h2, h3, h4, h5, h6, p, li {
   margin-right: 5px;
 }
 
+.fa:hover {
+  text-decoration: none;
+}
+
 .img-center {
   margin: 0 auto;
 }
@@ -951,6 +955,11 @@ code {
   margin: 0!important;
 }
 
+// gitter chat
+.gitter-chat-embed {
+ z-index: 20000 !important;
+}
+
 //uncomment this to see the dimensions of all elements outlined in red
 //* {
 //  border-color: red;
@@ -1058,3 +1067,5 @@ code {
     transform: rotate(0deg);
   }
 }
+
+@import "chat.less";
diff --git a/client/main.js b/client/main.js
index 892610e1eb..6f147abcf7 100644
--- a/client/main.js
+++ b/client/main.js
@@ -4,6 +4,105 @@ main.mapShareKey = 'map-shares';
 
 main.ga = window.ga || function() {};
 
+main = (function(main) {
+
+  // should be set before gitter script loads
+  ((window.gitter = {}).chat = {}).options = {
+    disableDefaultChat: true
+  };
+  // wait for sidecar to load
+
+  main.chat = {};
+  main.chat.isOpen = false;
+  main.chat.createHelpChat = function createHelpChat() {
+    throw new Error('Sidecar chat has not initialized');
+  };
+
+  document.addEventListener('gitter-sidecar-ready', function(e) {
+    main.chat.GitterChat = e.detail.Chat;
+
+    main.chat.createHelpChat = function(room, helpChatBtnClass, roomTitle) {
+      roomTitle = roomTitle || 'Waypoint Help';
+
+      $('body').append(
+        '<aside id="chat-embed-help" class="gitter-chat-embed is-collapsed" />'
+      );
+
+      main.chat.helpChat = new main.chat.GitterChat({
+        room: room,
+        activationElement: false,
+        targetElement: $('#chat-embed-help')
+      });
+
+      $(helpChatBtnClass).on('click', function() {
+        // is button already pressed?
+        // no? open chat
+        // yes? close chat
+        var shouldChatBeOpen = !$(this).hasClass('active');
+        main.chat.helpChat.toggleChat(shouldChatBeOpen);
+        if (shouldChatBeOpen) {
+          $(helpChatBtnClass).addClass('active');
+        }
+      });
+
+      var helpTitleAdd = false;
+      $('#chat-embed-help').on('gitter-chat-toggle', function(e) {
+        var shouldButtonBePressed = !!e.originalEvent.detail.state;
+
+        if (!helpTitleAdd) {
+          helpTitleAdd = true;
+          $('#chat-embed-help > .gitter-chat-embed-action-bar').prepend(
+            '<div class="chat-embed-main-title">' +
+              '<span>' +
+                roomTitle +
+              '</span>' +
+            '</div>'
+          );
+        }
+
+        if (shouldButtonBePressed) {
+          return $(helpChatBtnClass).addClass('active');
+        }
+        return $(helpChatBtnClass).removeClass('active');
+      });
+    };
+
+    $('body').append(
+      '<aside id="chat-embed-main" class="gitter-chat-embed is-collapsed" />'
+    );
+
+    main.chat.mainChat = new main.chat.GitterChat({
+      room: 'freecodecamp/freecodecamp',
+      activationElement: false,
+      targetElement: $('#chat-embed-main')
+    });
+
+    var mainChatTitleAdded = false;
+    $('#chat-embed-main').on('gitter-chat-toggle', function() {
+      if (mainChatTitleAdded) {
+        return null;
+      }
+      mainChatTitleAdded = true;
+
+      $('#chat-embed-main > .gitter-chat-embed-action-bar').prepend(
+        '<div class="chat-embed-main-title">' +
+          '<span>Free Code Camp\'s Main Chat</span>' +
+        '</div>'
+      );
+    });
+
+
+    $('#nav-chat-btn').on('click', function() {
+      if (!main.chat.isOpen) {
+
+        main.chat.mainChat.toggleChat(true);
+      }
+    });
+  });
+
+  return main;
+}(main));
+
 var lastCompleted = typeof lastCompleted !== 'undefined' ?
   lastCompleted :
   '';
@@ -38,9 +137,10 @@ function setMapShare(id) {
 
 $(document).ready(function() {
 
+
   var challengeName = typeof challengeName !== 'undefined' ?
     challengeName :
-    'Untitled';
+    '';
 
   if (challengeName) {
     ga('send', 'event',  'Challenge', 'load', challengeName);
@@ -135,7 +235,7 @@ $(document).ready(function() {
             'links to screenshots if possible.\n\n'
           ].join('');
 
-          if (editor.getValue().trim()) {
+          if (typeof editor !== 'undefined' && editor.getValue().trim()) {
             var type;
             switch (challengeType) {
               case challengeTypes.HTML_CSS_JQ:
diff --git a/common/app/components/Footer/links.json b/common/app/components/Footer/links.json
index 92199b127f..8089a868e4 100644
--- a/common/app/components/Footer/links.json
+++ b/common/app/components/Footer/links.json
@@ -2,7 +2,7 @@
   {
     "className": "ion-speakerphone",
     "content": " Blog  ",
-    "href": "http://blog.freecodecamp.com",
+    "href": "http://medium.freecodecamp.com",
     "target": "_blank"
   },
   {
diff --git a/common/models/challenge.json b/common/models/challenge.json
index 84cf3a4c6b..81d6af6eef 100644
--- a/common/models/challenge.json
+++ b/common/models/challenge.json
@@ -82,6 +82,10 @@
     },
     "descriptionPt": {
       "type": "array"
+    },
+    "solutions": {
+      "type": "array",
+      "default": []
     }
   },
   "validations": [],
diff --git a/gulpfile.js b/gulpfile.js
index fd5fdda38d..4ae0d93d23 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -79,6 +79,7 @@ var paths = {
   ],
 
   less: './client/less/main.less',
+  lessFiles: './client/less/*.less',
 
   manifest: 'server/manifests/',
 
@@ -392,7 +393,7 @@ var watchDependents = [
 ];
 
 gulp.task('watch', watchDependents, function() {
-  gulp.watch(paths.less, ['less']);
+  gulp.watch(paths.lessFiles, ['less']);
   gulp.watch(paths.js, ['js']);
   gulp.watch(paths.challenges, ['test-challenges']);
   gulp.watch(paths.js, ['js', 'dependents']);
diff --git a/package.json b/package.json
index 06d6a933ce..1c6f77559a 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,8 @@
     "url": "https://github.com/freecodecamp/freecodecamp.git"
   },
   "scripts": {
+    "first-time": "npm run create-rev && echo '\n\nseeding database\n\n' && node seed && node seed/nonprofits",
+    "create-rev": "test ! -e server/rev-manifest.json && echo '\n\ncreating manifest\n\n' && touch server/rev-manifest.json && echo '{}' >> server/rev-manifest.json",
     "build": "gulp build",
     "start": "babel-node server/server.js",
     "prestart-production": "bower cache clean && bower install && gulp build",
@@ -49,6 +51,13 @@
     "forever": "~0.14.1",
     "frameguard": "^0.2.2",
     "github-api": "~0.7.0",
+    "gulp": "~3.8.8",
+    "gulp-eslint": "~0.9.0",
+    "gulp-inject": "~1.0.2",
+    "gulp-jsonlint": "^1.1.0",
+    "gulp-nodemon": "^2.0.3",
+    "gulp-notify": "^2.2.0",
+    "gulp-plumber": "^1.0.1",
     "gulp-less": "^3.0.3",
     "gulp-minify-css": "~0.5.1",
     "gulp-reduce-file": "0.0.1",
@@ -114,13 +123,6 @@
     "browserify": "^10.2.4",
     "chai": "~1.10.0",
     "envify": "^3.4.0",
-    "gulp": "~3.8.8",
-    "gulp-eslint": "~0.9.0",
-    "gulp-inject": "~1.0.2",
-    "gulp-jsonlint": "^1.1.0",
-    "gulp-nodemon": "^2.0.3",
-    "gulp-notify": "^2.2.0",
-    "gulp-plumber": "^1.0.1",
     "istanbul": "^0.3.15",
     "loopback-explorer": "^1.7.2",
     "loopback-testing": "^1.1.0",
diff --git a/seed/challenges/advanced-bonfires.json b/seed/challenges/advanced-bonfires.json
index 8ff025e2fe..04ab7c18b2 100644
--- a/seed/challenges/advanced-bonfires.json
+++ b/seed/challenges/advanced-bonfires.json
@@ -57,6 +57,9 @@
       "MDNlinks": [
         "RegExp"
       ],
+      "solutions": [
+        "var re = /^(?:(?:\\+?1\\s*(?:[.-]\\s*)?)?(?:\\(\\s*([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9])\\s*\\)|([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9]))\\s*(?:[.-]\\s*)?)?([2-9]1[02-9]|[2-9][02-9]1|[2-9][02-9]{2})\\s*(?:[.-]\\s*)?([0-9]{4})$/;\n\nfunction telephoneCheck(str) {\n  return !!str.match(re);\n}\n\ntelephoneCheck(\"555-555-5555\");"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -88,13 +91,15 @@
       "tests": [
         "assert.sameMembers(sym([1, 2, 3], [5, 2, 1, 4]), [3, 5, 4], 'message: <code>sym([1, 2, 3], [5, 2, 1, 4])</code> should return <code>[3, 5, 4]</code>.');",
         "assert.sameMembers(sym([1, 2, 5], [2, 3, 5], [3, 4, 5]), [1, 4, 5], 'message: <code>sym([1, 2, 5], [2, 3, 5], [3, 4, 5])</code> should return <code>[1, 4, 5]</code>');",
-        "assert.sameMembers(sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]), [1, 4, 5], 'message: <code>sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5])</code> should return <code>[1, 4, 5]</code>.');",
-        "assert.sameMembers(sym([1, 1]), [1], 'message: <code>sym([1, 1])</code> should return <code>[1]</code>.');"
-      ],
+        "assert.sameMembers(sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5]), [1, 4, 5], 'message: <code>sym([1, 1, 2, 5], [2, 2, 3, 5], [3, 4, 5, 5])</code> should return <code>[1, 4, 5]</code>.');"
+       ],
       "MDNlinks": [
         "Array.reduce()",
         "Symmetric Difference"
       ],
+      "solutions": [
+        "function sym(args) {\n  var index = -1;\n  var length = arguments.length;\n  var result;\n  while (++index < length) {\n    var array = arguments[index];\n    result = result ? diff(result, array).concat(diff(array, result)) : array;\n  }\n  return result ? uniq(result) : [];\n}\n\nfunction uniq(arr) {\n  var h = Object.create(null);\n  var u = [];\n  arr.forEach(function(v) {\n    if (v in h) return;\n    h[v] = true;\n    u.push(v);\n  });\n  return u;\n}\n\nfunction diff(a, b) {\n  var h = Object.create(null);\n  b.forEach(function(v) {\n    h[v] = true;  \n  });\n  return a.filter(function(v) { return !(v in h);});\n}\nsym([1, 2, 3], [5, 2, 1, 4]);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -151,6 +156,9 @@
       "MDNlinks": [
         "Global Object"
       ],
+      "solutions": [
+        "var VALUES = [1, 5, 10, 25, 100, 500, 1000, 2000, 10000];\n\nfunction drawer(price, cash, cid) {\n  cash = ~~(cash * 100);\n  price = ~~(price * 100);\n  var diff = cash-price;\n  cid.forEach(function(c) {\n    c[1] = ~~(c[1] * 100);\n  });\n  var totalCid = cid.reduce(function(a, c) {\n    return a + c[1];\n  }, 0);\n  if (diff > totalCid) {\n    return \"Insufficient Funds\";\n  }\n  if (diff === totalCid) {\n    return \"Closed\";\n  }\n  \n  var change = []; \n  var index = cid.length;\n  while (diff > 0 && --index > -1) {\n    var t = 0;\n    var value = VALUES[index];\n    while (diff >= value && cid[index][1] > 0) {\n      t += value;\n      cid[index][1] -= value;\n      diff -= value;\n    }\n    if (t) {\n      change.push([cid[index][0], t/100]);\n    }\n    console.log(JSON.stringify(change));\n  }\n  // Here is your change, ma'am.\n  return change;\n}\n\n// Example cash-in-drawer array:\n// [['PENNY', 1.01],\n// ['NICKEL', 2.05],\n// ['DIME', 3.10],\n// ['QUARTER', 4.25],\n// ['ONE', 90.00],\n// ['FIVE', 55.00],\n// ['TEN', 20.00],\n// ['TWENTY', 60.00],\n// ['ONE HUNDRED', 100.00]]\n\ndrawer(19.50, 20.00, [['PENNY', 1.01], ['NICKEL', 2.05], ['DIME', 3.10], ['QUARTER', 4.25], ['ONE', 90.00], ['FIVE', 55.00], ['TEN', 20.00], ['TWENTY', 60.00], ['ONE HUNDRED', 100.00]]);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -205,6 +213,9 @@
       "MDNlinks": [
         "Global Array Object"
       ],
+      "solutions": [
+        "function inventory(arr1, arr2) {\n  arr2.forEach(function(item) {\n    createOrUpdate(arr1, item);\n  });\n  // All inventory must be accounted for or you're fired!\n  return arr1;\n}\n\nfunction createOrUpdate(arr1, item) {\n  var index = -1;\n  while (++index < arr1.length) {\n    if (arr1[index][1] === item[1]) {\n      arr1[index][0] += item[0];\n      return;\n    }\n    if (arr1[index][1] > item[1]) {\n      break;\n    }\n  }\n  arr1.splice(index, 0, item);\n}\n\n// Example inventory lists\nvar curInv = [\n    [21, 'Bowling Ball'],\n    [2, 'Dirty Sock'],\n    [1, 'Hair Pin'],\n    [5, 'Microphone']\n];\n\nvar newInv = [\n    [2, 'Hair Pin'],\n    [3, 'Half-Eaten Apple'],\n    [67, 'Bowling Ball'],\n    [7, 'Toothpaste']\n];\n\ninventory(curInv, newInv);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -246,6 +257,9 @@
         "Permutations",
         "RegExp"
       ],
+      "solutions": [
+        "function permAlone(str) {\n  return permutor(str).filter(function(perm) {\n    return !perm.match(/(.)\\1/g);\n  }).length;\n}\n\nfunction permutor(str) {\n  // http://staff.roguecc.edu/JMiller/JavaScript/permute.html\n  //permArr: Global array which holds the list of permutations\n  //usedChars: Global utility array which holds a list of \"currently-in-use\" characters\n  var permArr = [], usedChars = [];\n  function permute(input) {\n    //convert input into a char array (one element for each character)\n    var i, ch, chars = input.split(\"\");\n    for (i = 0; i < chars.length; i++) {\n      //get and remove character at index \"i\" from char array\n      ch = chars.splice(i, 1);\n      //add removed character to the end of used characters\n      usedChars.push(ch);\n      //when there are no more characters left in char array to add, add used chars to list of permutations\n      if (chars.length === 0) permArr[permArr.length] = usedChars.join(\"\");\n      //send characters (minus the removed one from above) from char array to be permuted\n      permute(chars.join(\"\"));\n      //add removed character back into char array in original position\n      chars.splice(i, 0, ch);\n      //remove the last character used off the end of used characters array\n      usedChars.pop();\n    }\n  }\n  permute(str);\n  return permArr;\n}\n\npermAlone('aab');\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -291,6 +305,9 @@
         "String.substr()",
         "parseInt()"
       ],
+      "solutions": [
+        "function friendly(str) {\n  var dates = str.map(function(s) {return s.split('-').map(Number);});\n  var start = dates[0];\n  var end = dates[1];\n  if (str[0] === str[1]) {\n    return [readable(start)];\n  }\n  if (start[0] !== end[0]) {\n    if (start[0] + 1 === end[0] && start[1] > end[1]) {\n      start[0] = undefined;\n      end[0] = undefined;\n    }\n    return dates.map(readable);\n  }\n  start[0] = undefined;\n  end[0] = undefined;\n  if (start[1] !== end[1]) {\n    return dates.map(readable);\n  }\n  end[1] = undefined;\n  return dates.map(readable);\n}\n\nfunction readable(arr) {\n  var ordD = arr[2] + nth(arr[2]);\n  if (!arr[1]) {\n    return ordD;\n  }\n  return MONTH[arr[1]] +  \" \" + ordD + (!arr[0] ? \"\" : \", \" + arr[0]);\n}\n\nvar MONTH = {1: \"January\",\n             2: \"February\",\n             3: \"March\",\n             4: \"April\",\n             5: \"May\",\n             6: \"June\",\n             7: \"July\",\n             8: \"August\",\n             9: \"September\",\n             10: \"October\",\n             11: \"November\",\n             12: \"December\"};\n\nfunction nth(d) {\n  if(d>3 && d<21) return 'th';\n  switch (d % 10) {\n    case 1:  return \"st\";\n    case 2:  return \"nd\";\n    case 3:  return \"rd\";\n    default: return \"th\";\n  }\n} \n\nfriendly(['2015-07-01', '2015-07-04']);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json
index 627e95482f..850a8a2a88 100644
--- a/seed/challenges/basejumps.json
+++ b/seed/challenges/basejumps.json
@@ -6,62 +6,100 @@
     {
       "id": "bd7158d8c443eddfaeb5bcef",
       "title": "Get Set for Basejumps",
-      "challengeSeed": ["128451852"],
+      "challengeSeed": [],
       "description": [
-        "<span class='text-info'>Objective:</span> Get the MEAN stack running on Cloud 9, push your code to GitHub, and deploy it to Heroku.",
-        "We'll build our Basejumps on Cloud 9, a powerful online code editor with a full Ubuntu Linux workspace, all running in the cloud.",
-        "If you don't already have Cloud 9 account, create one now at <a href='http://c9.io' target='_blank'>http://c9.io</a>.",
-        "Now let's get your development environment ready for a new Angular-Fullstack application provided by Yeoman.",
-        "Open up <a href='http://c9.io' target='_blank'>http://c9.io</a> and sign in to your account.",
-        "Click on the \"+\" icon at the top right of the c9.io page to create a new workspace.",
-        "Give your workspace a name and an optional description.",
-        "Choose Node.js in the selection area below the name field.",
-        "Click the \"Create workspace\" button.",
-        "Once C9 builds and loads your workspace, you should see a terminal window in the lower right hand corner. In this window use the following commands. You don't need to know what these mean at this point.",
-        "Never run this command on your local machine. But in your Cloud 9 terminal window, run: <code>rm -rf * && echo \"export NODE_PATH=$NODE_PATH:/home/ubuntu/.nvm/v0.10.35/lib/node_modules\" >> ~/.bashrc && source ~/.bashrc && npm install -g yo grunt grunt-cli generator-angular-fullstack && yo angular-fullstack</code>",
-        "Yeoman will prompt you to answer some questions. Answer them like this:",
-        "What would you like to write scripts with? <span class='text-success'>JavaScript</span>",
-        "What would you like to write markup with? <span class='text-success'>HTML</span>",
-        "What would you like to write stylesheets with? <span class='text-success'>CSS</span>",
-        "What Angular router would you like to use? <span class='text-success'>ngRoute</span>",
-        "Would you like to include Bootstrap? <span class='text-success'>Yes</span>",
-        "Would you like to include UI Bootstrap? <span class='text-success'>Yes</span>",
-        "Would you like to use MongoDB with Mongoose for data modeling? <span class='text-success'>Yes</span>",
-        "Would you scaffold out an authentication boilerplate? <span class='text-success'>Yes</span>",
-        "Would you like to include additional oAuth strategies? <span class='text-success'>Twitter</span>",
-        "Would you like to use socket.io? <span class='text-success'>No</span>",
-        "May bower anonymously report usage statistics to improve the tool over time? (Y/n) <span class='text-success'>Y</span>",
-        "You may get an error similar to <code> ERR! EEXIST, open ‘/home/ubuntu/.npm</code>. This is caused when Cloud9 runs out of memory and kills an install. If you get this, simply re-run this process with the command <code>yo angular-fullstack</code>. You will then be asked a few questions regarding the re-install. Answer them as follows:",
-        "Existing .yo-rc configuration found, would you like to use it? (Y/n) <span class='text-success'>Y</span>",
-        "Overwrite client/favicon.ico? (Ynaxdh) <span class='text-success'>Y</span>",
-        "To finish the installation run the commands: <code>bower install && npm install</code>",
-        "To start MongoDB, run the following commands in your terminal: <code>mkdir data && echo 'mongod --bind_ip=$IP --dbpath=data --nojournal --rest \"$@\"' > mongod && chmod a+x mongod && ./mongod</code>",
-        "You will want to open up a new terminal to work from by clicking on the + icon and select New Terminal",
-        "Start the application by running the following command in your new terminal window: <code>grunt serve</code>",
-        "Wait for the following message to appear: <code>xdg-open: no method available for opening 'http://localhost:8080' </code>. Now you can open the internal Cloud9 browser. To launch the browser select Preview in the toolbar then select the dropdown option Preview Running Application.",
-        "Turn the folder in which your application is running into a Git repository by running the following commands: <code>git init && git add . && git commit -am 'initial commit'</code>.",
-        "Now we need to add your GitHub SSH key to c9.io. Click the \"Add-on Services\" button in the lower left of your C9 dashboard. Click \"activate\" next to the GitHub icon.",
-        "A pop up will appear. Allow access to your account.",
-        "While still on the dashboard, under “Account Settings”, click the link for \"Show your SSH key\". Copy the key to you clipboard.",
-        "Sign in to <a href='http://github.com' target='_blank'>http://github.com</a> and navigate to the GitHub SSH settings page. Click the \"Add SSH Key\". Give your key the title \"cloud 9\". Paste your SSH Key into the \"Key\" box, then click \"Add Key\".",
-        "Create a new GitHub repository by  and clicking on the + button next to your username in the upper-right hand side of your screen, then selecting \"New Repository\".",
-        "Enter a project name, then click the \"Create Repository\" button.",
-        "Find the \"...or push an existing repository from the command line\" section and click the Copy to Clipboard button beside it.",
-        "Paste the commands from your clipboard into the Cloud9 terminal prompt. This will push your changes to your repository on Cloud 9 up to GitHub.",
-        "Check back on your GitHub profile to verify the changes were successfully pushed up to GitHub.",
-        "Now let's push your code to Heroku. If you don't already have a Heroku account, create one at <a href='http://heroku.com' target='_blank'>http://heroku.com</a>. You shouldn't be charged for anything, but you will need to add your credit card information to your Heroku before you will be able to use Heroku's free MongoLab add on.",
-        "Before you publish to Heroku, you should free up as much memory as possible on Cloud9. In each of the Cloud9 terminal prompt tabs where MongoDB and Grunt are running, press the <code>control + c</code> hotkey to shut down these processes.",
-        "Run the following command in a Cloud9 terminal prompt tab: <code>npm install grunt-contrib-imagemin --save-dev && npm install --save-dev && heroku login</code>. At this point, the terminal will prompt you to log in to Heroku from the command line.",
-        "Now run <code>yo angular-fullstack:heroku</code>. You can choose a name for your Heroku project, or Heroku will create a random one for you. You can choose whether you want to deploy to servers the US or the EU.",
-        "Set the config flag for your Heroku environment and add MongoLab for your MongoDB instance by running the following command: <code>cd ~/workspace/dist && heroku config:set NODE_ENV=production && heroku addons:add mongolab</code>.",
-        "As you build your app, you should frequently commit changes to your codebase. Make sure you're in the <code>~/workspace</code> directory by running <code>cd ~/workspace</code>. Then you can use this code to stage the changes to your changes and commit them: <code>git commit -am \"your commit message\"</code>. Note that you should replace \"your commit message\" with a short summary of the changes you made to your code, such as \"added a records controller and corresponding routes\".",
-        "You can push these new commits to GitHub by running <code>git push origin master</code>, and to Heroku by running <code>grunt --force && grunt buildcontrol:heroku</code>.",
-        "If you need further guidance on using Yeoman Angular-Fullstack Generator, check out: <a href='https://github.com/clnhll/guidetobasejumps' target='_blank'>https://github.com/clnhll/guidetobasejumps</a>.",
-        "Now you're ready to move on to your first Basejump. Click the \"I've completed this challenge\" and move on."
+        [
+          "http://i.imgur.com/4IZjWZ3.gif",
+          "A gif showing how to create a c9.io account.",
+          "We recommend building our full stack Basejump challenges on c9.io, a powerful browser-based development environment. This save you hours of time that you would spend configuring your local computer to run Node.js and MongoDB - time you could instead spend coding. <br>Create a c9.io account by clicking the GitHub symbol in the upper right hand corner of the c9.io page. Click the big plus symbol to create a new workspace. Enter your email address when prompted.",
+          "http://c9.io"
+        ],
+        [
+          "http://i.imgur.com/F7i5Hhi.gif",
+          "A gif showing how to fill out the new workspace form",
+          "Instead of starting from scratch, we recommend using Clementine.js, a full stack JavaScript \"boilerplate\" that already has some basic code written for you. Clementine.js has a detailed tutorial you can go through to build it yourself, but for now let's just clone its code. On c9.io, give your workspace a name, then leave \"Template\" as custom and create your workspace from this GitHub url: <code>https://github.com/johnstonbl01/clementinejs-fcc.git</code>",
+          ""
+        ],
+        [
+          "http://i.imgur.com/42m1vyr.gif",
+          "A gif showing you how to show hidden files.",
+          "Click the gear in the upper right corner of c9.io's file structure. Select \"show hidden files\".",
+          ""
+        ],
+        [
+          "http://i.imgur.com/qrE8xaK.gif",
+          "A gif showing you how to create a new file.",
+          "Right click and create a new file called <code>.env</code>.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/jkQX9SQ.gif",
+          "A gif showing you how to prep your environmental variables in your .env file.",
+          "Open your .env file and paste this into it, then save it: <br><code>GITHUB_KEY=<br>GITHUB_SECRET=<br>MONGO_URI=mongodb://localhost:27017/clementinejs<br>PORT=8080<br>APP_URL=http://localhost:8080/</code>",
+          ""
+        ],
+        [
+          "http://i.imgur.com/f3DE7zB.gif",
+          "A gif showing you how to open c9.io's preview window.",
+          "Open up your application in a preview tab by clicking window > share > application > open.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/Ip0qUdQ.gif",
+          "A gif showing you how to create a GitHub app using c9.io's preview URL.",
+          "Create a GitHub app for authentication and choose an \"Application name\". For the homepage URL, paste the URL from your preview tab. You'll also paste the URL from your preview tab into \"Authorization callback URL\", then add to it: <code>auth/github/callback</code>",
+          "https://github.com/settings/applications/new"
+        ],
+        [
+          "http://i.imgur.com/qCUVRFb.gif",
+          "A gif showing you how to transfer GitHub's key and secret over to your .env file, as well as your c9.io URL.",
+          "GitHub will create an app and present you with a Client ID and a Client Secret. Set your .env file's GITHUB_KEY equal to the Client ID, and set your .env file's GITHUB_SECRET equal to the Client Secret. Copy the URL from the your preview tab and paste it into your .env file as your APP_URL.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/2a20Vah.gif",
+          "A gif showing you how to start mongoDB in c9.io's terminal.",
+          "In your terminal, start MongoDB by entering <code>mongod --smallfiles</code>",
+          ""
+        ],
+        [
+          "http://i.imgur.com/dC55pWk.gif",
+          "A gif showing you how to open a new tab in c9.io's terminal.",
+          "Open a new terminal tab with the + button above your terminal, then run <code>npm install</code>",
+          ""
+        ],
+        [
+          "http://i.imgur.com/54OC2Ro.gif",
+          "A gif showing you how to navigate to your preview tab and sign in to your new Clementine.js app.",
+          "Run <code>node server.js</code> to start the server. Refresh your preview tab. You should see the Clementine.js logo. Click \"sign in\" and accept GitHub's prompt to authorize the application.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/2IJfyvN.gif",
+          "A gif showing you how to click the button to trigger an AJAX action with Clementine.js and how to look at your user profile from the GitHub authentication data.",
+          "Click the \"click me\" button and you'll see that it increments the number clicks. Click the profile button and you'll see that it has your GitHub information.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/bjO5pnq.gif",
+          "A gif showing you how to create a new GitHub repository and push your code up to it.",
+          "Create a new GitHub repository. Then copy its .git URL. <br>Return to c9.io's terminal and set your GitHub remote URL: <code>git remote set-url origin</code> followed by the URL you copied from GitHub. <br>Run <code>git push origin master</code>. <br>Now tab back to GitHub and refresh, and you'll see that your code is now on GitHub.",
+          "https://github.com/new"
+        ]
       ],
-      "type": "waypoint",
-      "challengeType": 2,
-      "tests": []
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "",
+      "descriptionEs": [],
+      "namePt": "",
+      "descriptionPt": []
     },
     {
       "id": "bd7158d8c443eddfaeb5bdef",
diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json
index d3a0f22893..8ac6cbcae7 100644
--- a/seed/challenges/basic-bonfires.json
+++ b/seed/challenges/basic-bonfires.json
@@ -28,6 +28,9 @@
         "",
         "meetBonfire(\"You can do this!\");"
       ],
+      "solutions": [
+        "function meetBonfire(argument) {\n  // Good luck!\n  console.log(\"you can read this function's argument in the developer tools\", argument);\n\n  return true;\n}\n\n\n\nmeetBonfire(\"You can do this!\");\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -69,6 +72,9 @@
         "Array.reverse()",
         "Array.join()"
       ],
+      "solutions": [
+        "function reverseString(str) {\n  return str.split('').reverse().join(\"\");\n}\n\nreverseString('hello');\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -109,6 +115,9 @@
       "MDNlinks": [
         "Arithmetic Operators"
       ],
+      "solutions": [
+        "function factorialize(num) {\n  return num === 1 ? 1 : num * factorialize(num-1);\n}\n\nfactorialize(5);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -143,7 +152,7 @@
         "assert(palindrome(\"almostomla\") === false, 'message: <code>palindrome(\"almostomla\")</code> should return false.');",
         "assert(palindrome(\"My age is 0, 0 si ega ym.\") === true, 'message: <code>palindrome(\"My age is 0, 0 si ega ym.\")</code> should return true.');",
         "assert(palindrome(\"1 eye for of 1 eye.\") === false, 'message: <code>palindrome(\"1 eye for of 1 eye.\")</code> should return false.');",
-        "assert(palindrome(\"0_0 (: /-\\ :) 0-0\") === true, 'message: <code>palindrome(\"0_0 (: /-\\\\ :) 0-0\")</code> should return true.');"
+        "assert(palindrome(\"0_0 (: /-\\ :) 0-0\") === true, 'message: <code>palindrome(\"0_0 (: /-\\ :) 0-0\")</code> should return true.');"
       ],
       "challengeSeed": [
         "function palindrome(str) {",
@@ -159,6 +168,9 @@
         "String.replace()",
         "String.toLowerCase()"
       ],
+      "solutions": [
+        "function palindrome(str) {\n  var a = str.toLowerCase().replace(/[^a-z]/g, '');\n  console.log(a.split('').reverse().join(''));\n  return a == a.split('').reverse().join('');\n}\n\n\n\npalindrome(\"eye\");\npalindrome(\"A man, a plan, a canal. Panama\");\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -199,6 +211,9 @@
         "String.split()",
         "String.length"
       ],
+      "solutions": [
+        "function findLongestWord(str) {\n  return str.split(' ').sort(function(a, b) { return b.length - a.length;})[0].length;\n}\n\nfindLongestWord('The quick brown fox jumped over the lazy dog');\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -236,6 +251,9 @@
       "MDNlinks": [
         "String.charAt()"
       ],
+      "solutions": [
+        "function titleCase(str) {\n  return str.split(' ').map(function(word) {\n    return word.charAt(0).toUpperCase() + word.substring(1).toLowerCase();\n  }).join(' ');\n}\n\ntitleCase(\"I'm a little tea pot\");\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -274,6 +292,9 @@
       "MDNlinks": [
         "Comparison Operators"
       ],
+      "solutions": [
+        "function largestOfFour(arr) {\n  return arr.map(function(subArr) {\n    return Math.max.apply(null, subArr);\n  });\n}\n\nlargestOfFour([[4, 5, 1, 3], [13, 27, 18, 26], [32, 35, 37, 39], [1000, 1001, 857, 1]]);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -306,7 +327,7 @@
       "tests": [
         "assert(end(\"Bastian\", \"n\") === true, 'message: <code>end(\"Bastian\", \"n\")</code> should return true.');",
         "assert(end(\"Connor\", \"n\") === false, 'message: <code>end(\"Connor\", \"n\")</code> should return false.');",
-        "assert(end(\"Walking on water and developing software from a specification are easy if both are frozen.\", \"specification\") === false, 'message: <code>end(\"Walking on water and developing software from a specification are easy if both are frozen.\", \"specification\")</code> should return false.');",
+        "assert(end(\"Walking on water and developing software from a specification are easy if both are frozen\", \"specification\") === false, '<code>\"Walking on water and developing software from a specification are easy if both are frozen\"&#44; \"specification\"&#41;</code> should return false.');",
         "assert(end(\"He has to give me a new name\", \"name\") === true, 'message: <code>end(\"He has to give me a new name\", \"name\")</code> should return true.');",
         "assert(end(\"He has to give me a new name\", \"me\") === true, 'message: <code>end(\"He has to give me a new name\", \"me\")</code> should return true.');",
         "assert(end(\"If you want to save our world, you must hurry. We dont know how much longer we can withstand the nothing\", \"mountain\") === false, 'message: <code>end(\"If you want to save our world, you must hurry. We dont know how much longer we can withstand the nothing\", \"mountain\")</code> should return false.');"
@@ -314,6 +335,9 @@
       "MDNlinks": [
         "String.substr()"
       ],
+      "solutions": [
+        "function end(str, target) {\n  // \"Never give up and good luck will find you.\"\n  // -- Falcor\n  return str.substring(str.length-target.length) === target;\n}\n\nend('Bastian', 'n');\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -350,6 +374,9 @@
       "MDNlinks": [
         "Global String Object"
       ],
+      "solutions": [
+        "function repeat(str, num) {\n  if (num < 0) return '';\n  return num === 1 ? str : str + repeat(str, num-1);\n}\n\nrepeat('abc', 3);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -390,6 +417,9 @@
       "MDNlinks": [
         "String.slice()"
       ],
+      "solutions": [
+        "function truncate(str, num) {\n  if (str.length > num) {\n    return str.substring(0, num-3) + '...';\n  }\n  return str;\n}\n\ntruncate('A-tisket a-tasket A green and yellow basket', 11);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -427,6 +457,9 @@
       "MDNlinks": [
         "Array.push()"
       ],
+      "solutions": [
+        "function chunk(arr, size) {\n  var out = [];\n  for (var i = 0; i < arr.length; i+=size) {\n    out.push(arr.slice(i,i+size));\n  }\n  return out;\n}\n\nchunk(['a', 'b', 'c', 'd'], 2);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -466,6 +499,9 @@
         "Array.slice()",
         "Array.splice()"
       ],
+      "solutions": [
+        "function slasher(arr, howMany) {\n  // it doesn't always pay to be first\n  return arr.slice(howMany);\n}\n\nslasher([1, 2, 3], 2);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -509,6 +545,9 @@
       "MDNlinks": [
         "Array.indexOf()"
       ],
+      "solutions": [
+        "function mutation(arr) {\n  var hash = Object.create(null);\n  arr[0].toLowerCase().split('').forEach(function(c) {\n    hash[c] = true;\n  });\n  return !arr[1].toLowerCase().split('').filter(function(c) {\n    return !hash[c];\n  }).length;\n}\n\nmutation(['hello', 'hey']);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -547,6 +586,9 @@
         "Boolean Objects",
         "Array.filter()"
       ],
+      "solutions": [
+        "function bouncer(arr) {\n  // Don't show a false ID to this bouncer.\n  return arr.filter(function(e) {return e;});\n}\n\nbouncer([7, 'ate', '', false, 9]);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -586,6 +628,9 @@
         "Arguments object",
         "Array.filter()"
       ],
+      "solutions": [
+        "function destroyer(arr) {\n  var hash = Object.create(null);\n  [].slice.call(arguments, 1).forEach(function(e) {\n    hash[e] = true;\n  });\n  // Remove all the values\n  return arr.filter(function(e) { return !(e in hash);});\n}\n\ndestroyer([1, 2, 3, 1, 2, 3], 2, 3);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -603,8 +648,9 @@
       "id": "a24c1a4622e3c05097f71d67",
       "title": "Where do I belong",
       "description": [
-        "Return the lowest index at which a value (second argument) should be inserted into a sorted array (first argument).",
-        "For example, where([1,2,3,4], 1.5) should return 1 because it is greater than 1 (0th index), but less than 2 (1st index).",
+        "Return the lowest index at which a value (second argument) should be inserted into an array (first argument) once it has been sorted.",
+        "For example, where([1,2,3,4], 1.5) should return 1 because it is greater than 1 (index 0), but less than 2 (index 1).",
+        "Likewise, where([20,3,5], 19) should return 2 because it is less than 20 (index 2) and greater than 5 (index 1).",
         "Remember to use <a href=\"//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck\" target=\"_blank\">Read-Search-Ask</a> if you get stuck. Write your own code."
       ],
       "challengeSeed": [
@@ -618,12 +664,15 @@
       "MDNlinks": [
         "Array.sort()"
       ],
+      "solutions": [
+        "function where(arr, num) {\n  // Find my place in this sorted array.\n  return num;\n}\n\nwhere([40, 60], 50);\n"
+      ],
       "tests": [
         "assert(where([10, 20, 30, 40, 50], 35) === 3, 'message: <code>where([10, 20, 30, 40, 50], 35)</code> should return <code>3</code>.');",
         "assert(where([10, 20, 30, 40, 50], 30) === 2, 'message: <code>where([10, 20, 30, 40, 50], 30)</code> should return <code>2</code>.');",
         "assert(where([40, 60], 50) === 1, 'message: <code>where([40, 60,], 50)</code> should return <code>1</code>.');",
-        "assert(where([5, 3, 20, 3], 3) === 0, 'message: <code>where([5, 3, 20, 3], 3)</code> should return <code>0</code>.');",
-        "assert(where([2, 20, 10], 1) === 0, 'message: <code>where([2, 20, 10], 1)</code> should return <code>0</code>.');",
+        "assert(where([5, 3, 20, 3], 5) === 2, 'message: <code>where([5, 3, 20, 3], 5)</code> should return <code>2</code>.');",
+        "assert(where([2, 20, 10], 19) === 2, 'message: <code>where([2, 20, 10], 19)</code> should return <code>2</code>.');",
         "assert(where([2, 5, 10], 15) === 3, 'message: <code>where([2, 5, 10], 15)</code> should return <code>3</code>.');"
       ],
       "type": "bonfire",
diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json
index e215cddda0..b22ee617c7 100644
--- a/seed/challenges/basic-javascript.json
+++ b/seed/challenges/basic-javascript.json
@@ -4,26 +4,23 @@
   "time": "3h",
   "challenges": [
     {
-      "id":"bd7123c9c441eddfaeb4bdef",
+      "id": "bd7123c9c441eddfaeb4bdef",
       "title": "Comment your JavaScript Code",
-      "difficulty":"9.98",
-      "description":[
+      "description": [
         "Comments are lines of code that your computer will intentionally ignore. Comments are a great way to leave notes to yourself and to other people who will later need to figure out what it does.",
         "Let's take a look at the two ways you can write comments in JavaScript.",
         "The double-slash comment will comment out the remainder of the text on the current line:",
         "<code>// This is a comment.</code>",
         "The slash-star-star-slash comment will comment out everything between the <code>/*</code> and the <code>*/</code> characters:",
         "<code>/* This is also a comment */</code>",
-        "Try creating one of each.",
-        "And one more thing you need to notice. Starting at this waypoint in JavaScript related challenges (except AngularJS, all Ziplines, Git, Node.js and Express.js, MongoDB and Full Stack JavaScript Projects) you can see contents of <code>assert()</code> functions (in some challenges <code>except()</code>, <code>assert.equal()</code> and so on) which are used to test your code. It's part of these challenges that you are able to see the tests that are running against your code."
+        "Try creating one of each."
       ],
-      "tests":[
-        "assert(editor.getValue().match(/(\\/\\/)...../g), 'message: Create a <code>//</code> style comment that contains at least five letters');",
+      "tests": [
+        "assert(editor.getValue().match(/(\\/\\/)...../g), 'message: Create a <code>//</code> style comment that contains at least five letters.');",
         "assert(editor.getValue().match(/(\\/\\*)[\\w\\W]{5,}(?=\\*\\/)/gm), 'message: Create a <code>/* */</code> style comment that contains at least five letters.');",
-        "assert(editor.getValue().match(/(\\*\\/)/g), 'message: Make sure that you close the comment with a <code>*/</code>');"
-      ],
-      "challengeSeed":[
+        "assert(editor.getValue().match(/(\\*\\/)/g), 'message: Make sure that you close the comment with a <code>*/</code>.');"
       ],
+      "challengeSeed": [],
       "type": "waypoint",
       "challengeType": 1
     },
@@ -33,7 +30,7 @@
       "description": [
         "In computer science, <code>data structures</code> are things that hold data. JavaScript has seven of these. For example, the <code>Number</code> data structure holds numbers.",
         "Let's learn about the most basic data structure of all: the <code>Boolean</code>. Booleans can only hold the value of either true or false. They are basically little on-off switches.",
-        "Let's modify our <code>welcomeToBooleans</code>function so that it will return <code>true</code>instead of <code>false</code>when the run button is clicked."
+        "Let's modify our <code>welcomeToBooleans</code> function so that it will return <code>true</code> instead of <code>false</code>when the run button is clicked."
       ],
       "tests": [
         "assert(typeof(welcomeToBooleans()) === 'boolean', 'message: The <code>welcomeToBooleans()</code> function should return a boolean &#40;true/false&#41; value.');",
@@ -68,12 +65,10 @@
         "assert((function(){if(typeof(myName) !== \"undefined\" && typeof(myName) === \"string\" && myName.length > 0){return true;}else{return false;}})(), 'message: <code>myName</code> should be a string that contains at least one character in it.');"
       ],
       "challengeSeed": [
-        "// var ourName = \"Free Code Camp\";",
+        "var ourName = \"Free Code Camp\";",
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
         "",
         "if(typeof(myName) !== \"undefined\"){(function(v){return v;})(myName);}"
       ],
@@ -85,21 +80,20 @@
       "title": "Declare String Variables",
       "description": [
         "In the previous challenge, we used the code <code>var myName = \"your name\"</code>. This is what we call a <code>String</code> variable. It is nothing more than a \"string\" of characters. JavaScript strings are always wrapped in quotes.",
-        "Now let's create two new string variables: <code>myFirstName</code>and <code>myLastName</code> and assign them the values of your first and last name, respectively."
+        "Now let's create two new string variables: <code>myFirstName</code> and <code>myLastName</code> and assign them the values of your first and last name, respectively."
       ],
       "tests": [
         "assert((function(){if(typeof(myFirstName) !== \"undefined\" && typeof(myFirstName) === \"string\" && myFirstName.length > 0){return true;}else{return false;}})(), 'message: <code>myFirstName</code> should be a string with at least one character in it.');",
         "assert((function(){if(typeof(myLastName) !== \"undefined\" && typeof(myLastName) === \"string\" && myLastName.length > 0){return true;}else{return false;}})(), 'message: <code>myLastName</code> should be a string with at least one character in it.');"
       ],
       "challengeSeed": [
-        "// var name = \"Alan Turing\";",
-        "// var firstName = \"Alan\";",
-        "// var lastName = \"Turing\";",
+        "var name = \"Alan Turing\";",
+        "var firstName = \"Alan\";",
+        "var lastName = \"Turing\";",
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "if(typeof(myFirstName) !== \"undefined\" && typeof(myLastName) !== \"undefined\"){(function(){return myFirstName + ', ' + myLastName;})();}"
       ],
       "type": "waypoint",
@@ -133,8 +127,7 @@
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "if(typeof(lastNameLength) !== \"undefined\"){(function(){return lastNameLength;})();}"
       ],
       "type": "waypoint",
@@ -167,8 +160,7 @@
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(v){return v;})(firstLetterOfLastName);"
       ],
       "type": "waypoint",
@@ -178,9 +170,9 @@
       "id": "bd7123c9c450eddfaeb5bdef",
       "title": "Use Bracket Notation to Find the Nth Character in a String",
       "description": [
-        "You can also use <code>bracket Notation</code>to get the character at other positions within a string.",
+        "You can also use <code>bracket notation</code> to get the character at other positions within a string.",
         "Remember that computers start counting at 0, so the first character is actually the zeroth character.",
-        "Let's try to set <code>thirdLetterOfLastName</code>to equal the <code>third letter</code> of the <code>lastName</code> variable.",
+        "Let's try to set <code>thirdLetterOfLastName</code> to equal the <code>third letter</code> of the <code>lastName</code> variable.",
         "Try looking at the <code>secondLetterOfFirstName</code> variable declaration if you get stuck."
       ],
       "tests": [
@@ -197,8 +189,7 @@
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(v){return v;})(thirdLetterOfLastName);"
       ],
       "type": "waypoint",
@@ -228,8 +219,7 @@
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(v){return v;})(lastLetterOfLastName);"
       ],
       "type": "waypoint",
@@ -240,7 +230,7 @@
       "title": "Use Bracket Notation to Find the Nth-to-Last Character in a String",
       "description": [
         "In order to get the last letter of a string, you can subtract one from the string's length.",
-        "For example, you can get the value of the third-to-last letter of the <code>var firstName = \"Charles\"</code> string by using <code>firstName[firstName.length - 3]</code>.",
+        "For example, you can get the value of the third-to-last letter of the <code>var firstName = \"Charles\"</code> string by using <code>firstName[firstName.length - 3]</code>",
         "Use <code>bracket notation</code> to find the second-to-last character in the <code>lastName</code> string.",
         "Try looking at the <code>thirdToLastLetterOfFirstName</code> variable declaration if you get stuck."
       ],
@@ -259,8 +249,7 @@
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(v){return v;})(secondToLastLetterOfLastName);"
       ],
       "type": "waypoint",
@@ -272,17 +261,16 @@
       "description": [
         "Let's try to add two numbers using JavaScript.",
         "JavaScript uses the <code>+</code> symbol for addition.",
-        "Replace the <code>0</code> with the correct number so you can get the result mentioned in the comment."
+        "Change the <code>0</code> so that sum will equal <code>20</code>."
       ],
       "tests": [
         "assert((function(){if(sum === 20 && editor.getValue().match(/\\+/g).length >= 2){return true;}else{return false;}})(), 'message: Make the variable <code>sum</code> equal 20.');"
       ],
       "challengeSeed": [
-        "var sum = 10 + 0; //make this equal to 20 by changing the 0 into the appropriate number.",
+        "var sum = 10 + 0;",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(z){return 'sum='+z;})(sum);"
       ],
       "type": "waypoint",
@@ -294,17 +282,16 @@
       "description": [
         "We can also subtract one number from another.",
         "JavaScript uses the <code>-</code> symbol for subtraction.",
-        "Replace the <code>0</code> with the correct number so you can get the result mentioned in the comment."
+        "Change the <code>0</code> so that difference will equal <code>12</code>."
       ],
       "tests": [
         "assert((function(){if(difference === 12 && editor.getValue().match(/\\-/g)){return true;}else{return false;}})(), 'message: Make the variable <code>difference</code> equal 12.');"
       ],
       "challengeSeed": [
-        "var difference = 45 - 0; //make this equal to 12 by changing the 0 into the appropriate number.",
+        "var difference = 45 - 0;",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(z){return 'difference='+z;})(difference);"
       ],
       "type": "waypoint",
@@ -316,17 +303,16 @@
       "description": [
         "We can also multiply one number by another.",
         "JavaScript uses the <code>*</code> symbol for multiplication.",
-        "Replace the <code>0</code> with the correct number so you can get the result mentioned in the comment."
+        "Change the <code>0</code> so that product will equal <code>80</code>."
       ],
       "tests": [
         "assert((function(){if(product === 80 && editor.getValue().match(/\\*/g)){return true;}else{return false;}})(), 'message: Make the variable <code>product</code> equal 80.');"
       ],
       "challengeSeed": [
-        "var product = 8 * 0; // Make this equal to 80 by changing the 0 into the appropriate number.",
+        "var product = 8 * 0;",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(z){return 'product='+z;})(product);"
       ],
       "type": "waypoint",
@@ -338,17 +324,16 @@
       "description": [
         "We can also divide one number by another.",
         "JavaScript uses the <code>/</code> symbol for division.",
-        "Replace the <code>0</code> with the correct number so you can get the result mentioned in the comment."
+        "Change the <code>0</code> so that quotient will equal <code>2</code>."
       ],
       "tests": [
         "assert((function(){if(quotient === 2 && editor.getValue().match(/var\\s*?quotient\\s*?\\=\\s*?\\d+\\s*?\\/\\s*?\\d+\\s*?;/g)){return true;}else{return false;}})(), 'message: Make the variable <code>quotient</code> equal 2.');"
       ],
       "challengeSeed": [
-        "var quotient = 66 / 0; //make this equal to 2 by changing the 0 into the appropriate number.",
+        "var quotient = 66 / 0;",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(z){return 'quotient='+z;})(quotient);"
       ],
       "type": "waypoint",
@@ -365,14 +350,11 @@
         "assert((function(){if(typeof(myDecimal) !== \"undefined\" && typeof(myDecimal) === \"number\" && editor.getValue().match(/\\./g).length >=2){return true;}else{return false;}})(), 'message: <code>myDecimal</code> should be a decimal point number.');"
       ],
       "challengeSeed": [
-        "// var ourDecimal = 5.7;",
-        "// Create a number with a decimal point here called myDecimal",
-        "",
+        "var ourDecimal = 5.7;",
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(){if(typeof(myDecimal) !== \"undefined\"){return myDecimal;}})();"
       ],
       "type": "waypoint",
@@ -380,28 +362,47 @@
     },
     {
       "id": "bd7993c9c69feddfaeb7bdef",
-      "title": "Perform Arithmetic Operations on Decimals with JavaScript",
+      "title": "Multiply Two Decimals with JavaScript",
       "description": [
         "In JavaScript, you can also perform calculations with decimal numbers, just like whole numbers.",
-        "Replace the <code>0.0</code> with the correct number so that you get the result mentioned in the comments."
+        "Let's multiply two decimals together to get their product.",
+        "Change the <code>0.0</code> so that product will equal <code>5.0</code>."
       ],
       "tests": [
-        "assert((function(){if(product === 5.0 && editor.getValue().match(/\\*/g)){return true;}else{return false;}})(), 'message: Make the variable <code>product</code> equal 5.0.');",
-        "assert((function(){if(quotient === 2.2 && editor.getValue().match(/\\//g)){return true;}else{return false;}})(), 'message: Make the variable <code>quotient</code> equal 2.2.');"
+        "assert((function(){if(product === 5.0 && editor.getValue().match(/\\*/g)){return true;}else{return false;}})(), 'message: Make the variable <code>product</code> equal 5.0.');"
       ],
       "challengeSeed": [
-        "var quotient = 4.4 / 2.0; // equals 2.2",
-        "var product = 2.0 * 0.0; // equals 5.0",
+        "var product = 2.0 * 0.0;",
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(y){return 'product='+y;})(product);"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
+    {
+      "id": "bd7993c9ca9feddfaeb7bdef",
+      "title": "Divide one Decimal by Another with JavaScript",
+      "description": [
+        "Now let's divide one decimal by another.",
+        "Change the <code>0.0</code> so that your quotient will equal <code>2.2</code>."
+      ],
+      "tests": [
+        "assert((function(){if(quotient === 2.2 && editor.getValue().match(/\\//g)){return true;}else{return false;}})(), 'message: Make the variable <code>quotient</code> equal <code>2.2</code>.');"
+      ],
+      "challengeSeed": [
+        "var quotient = 0.0 / 2.0;",
+        "",
+        "",
+        "// Only change code above this line.",
+        "",
+        "(function(y){return 'quotient='+y;})(quotient);"
+      ],
+      "type": "waypoint",
+      "challengeType": 1
+    },
     {
       "id": "bd7993c9c69feddfaeb8bdef",
       "title": "Store Multiple Values in one Variable using JavaScript Arrays",
@@ -417,50 +418,47 @@
         "assert(typeof(myArray[1]) !== 'undefined' && typeof(myArray[1]) == 'number', 'message: The second item in <code>myArray</code> should be a <code>number</code>.');"
       ],
       "challengeSeed": [
-        "// var array = [\"John\", 23];",
+        "var array = [\"John\", 23];",
         "",
         "// Only change code below this line.",
         "",
         "var myArray = [];",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(z){return z;})(myArray);"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c11feddfaeb7bdef",
+      "id": "cf1111c1c11feddfaeb7bdef",
       "title": "Nest one Array within Another Array",
-      "difficulty":"9.98161",
-      "description":[
+      "description": [
         "You can also nest arrays within other arrays, like this: <code>[[\"Bulls\", 23]]</code>.",
         "Let's now go create a nested array called <code>myArray</code>."
       ],
-      "tests":[
+      "tests": [
         "assert(Array.isArray(myArray) && myArray.some(Array.isArray), 'message: <code>myArray</code> should have at least one array nested within another array.');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "var ourArray = [[\"the universe\", \"everything\", 42]];",
+        "",
         "// Only change code below this line.",
         "",
         "var myArray = [];",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "if(typeof(myArray) !== \"undefined\"){(function(){return myArray;})();}"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"bg9997c9c79feddfaeb9bdef",
+      "id": "bg9997c9c79feddfaeb9bdef",
       "title": "Access Array Data with Indexes",
-      "difficulty":"9.9817",
-      "description":[
+      "description": [
         "We can access the data inside arrays using <code>indexes</code>.",
         "Array indexes are written in the same bracket notation that strings use, except that instead of specifying a character, they are specifying an entry in the array.",
         "For example:",
@@ -469,51 +467,53 @@
         "<code>var data = array[1];</code>",
         "Create a variable called <code>myData</code> and set it to equal the first value of <code>myArray</code>."
       ],
-      "tests":[
+      "tests": [
         "assert((function(){if(typeof(myArray) != 'undefined' && typeof(myData) != 'undefined' && myArray[0] == myData){return true;}else{return false;}})(), 'message: The variable <code>myData</code> should equal the first value of <code>myArray</code>.');"
       ],
-      "challengeSeed":[
-        "// var ourArray = [1,2,3];",
-        "// var ourData = ourArray[0]; // equals 1",
+      "challengeSeed": [
+        "var ourArray = [1,2,3];",
+        "",
+        "var ourData = ourArray[0]; // equals 1",
         "",
         "var myArray = [1,2,3];",
+        "",
         "// Only change code below this line.",
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "if(typeof(myArray) !== \"undefined\" && typeof(myData) !== \"undefined\"){(function(y,z){return 'myArray = ' + JSON.stringify(y) + ', myData = ' + JSON.stringify(z);})(myArray, myData);}"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c11feddfaeb8bdef",
+      "id": "cf1111c1c11feddfaeb8bdef",
       "title": "Modify Array Data With Indexes",
-      "difficulty":"9.98171",
-      "description":[
+      "description": [
         "We can also modify the data stored in arrays by using indexes.",
         "For example:",
         "<code>var ourArray = [3,2,1];</code>",
         "<code>ourArray[0] = 1; // equals [1,2,1]</code>",
         "Now modify the data stored at index 0 of <code>myArray</code> to the value of 3."
       ],
-      "tests":[
+      "tests": [
         "assert((function(){if(typeof(myArray) != 'undefined' && myArray[0] == 3 && myArray[1] == 2 && myArray[2] == 3){return true;}else{return false;}})(), 'message: <code>myArray</code> should now be [3,2,3].');",
         "assert((function(){if(editor.getValue().match(/myArray\\[0\\]\\s?=\\s?/g)){return true;}else{return false;}})(), 'message: You should be using correct index to modify the value in <code>myArray</code>.');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "var ourArray = [1,2,3];",
-        "ourArray[1] = 3;",
-        "// ourArray now equals [1,3,3].",
+        "",
+        "ourArray[1] = 3; // ourArray now equals [1,3,3].",
+        "",
         "var myArray = [1,2,3];",
+        "",
         "// Only change code below this line.",
         "",
         "",
+        "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "if(typeof(myArray) !== \"undefined\"){(function(){return myArray;})();}"
       ],
       "type": "waypoint",
@@ -524,30 +524,28 @@
       "title": "Manipulate Arrays With pop()",
       "description": [
         "Another way to change the data in an array is with the <code>.pop()</code> function.",
-        "<code>.pop()</code>is used to \"pop\" a value off of the end of an array. We can retrieve this value by performing <code>pop()</code> in a variable declaration.",
-        "Any type of variable can be \"popped\" off of an array.",
-        "Use the <code>.pop()</code> function to remove the last item from <code>myArray</code>."
+        "<code>.pop()</code>is used to \"pop\" a value off of the end of an array. We can store this \"popped off\" variable by performing <code>pop()</code> within a variable declaration.",
+        "Any type of data structure can be \"popped\" off of an array - numbers, strings, even nested arrays.",
+        "Use the <code>.pop()</code> function to remove the last item from <code>myArray</code>, assigning the \"popped off\" value to <code>removedFromMyArray</code>."
       ],
       "tests": [
         "assert((function(d){if(d[0] == 'John' && d[1] == 23 && d[2] == undefined){return true;}else{return false;}})(myArray), 'message: <code>myArray</code> should only contain <code>[\"John\", 23]</code>.');",
-        "assert((function(d){if(d[0] == 'cat' && d[1] == 2 && d[2] == undefined){return true;}else{return false;}})(removed), 'message: <code>removed</code> should only contain <code>[\"cat\", 2]</code>.');"
+        "assert((function(d){if(d[0] == 'cat' && d[1] == 2 && d[2] == undefined){return true;}else{return false;}})(removedFromMyArray), 'message: <code>removedFromMyArray</code> should only contain <code>[\"cat\", 2]</code>.');"
       ],
       "challengeSeed": [
-        "// var numbers = [1,2,3];",
-        "// console.log(numbers); // logs [1,2,3]",
-        "// var removed = numbers.pop();",
-        "// console.log(numbers); // logs [1,2]",
-        "// console.log(removed); // logs 3",
+        "var ourArray = [1,2,3];",
+        "",
+        "var removedFromOurArray = ourArray.pop(); // removedFromOurArray now equals 3, and ourArray now equals [1,2]",
         "",
         "var myArray = [\"John\", 23, [\"cat\", 2]];",
+        "",
         "// Only change code below this line.",
         "",
-        "var removed = myArray; // This should be [\"cat\", 2] and myArray should now be [\"John\", 23]",
+        "var removedFromMyArray;",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
-        "(function(y, z){return 'myArray = ' + JSON.stringify(y) + ' & removed = ' + JSON.stringify(z);})(myArray, removed);"
+        "",
+        "(function(y, z){return 'removedFromMyArray = ' + JSON.stringify(y) + ' & removed = ' + JSON.stringify(z);})(myArray, removedFromMyArray);"
       ],
       "type": "waypoint",
       "challengeType": 1
@@ -557,26 +555,28 @@
       "title": "Manipulate Arrays With push()",
       "description": [
         "Not only can you <code>pop()</code> data off of the end of an array, you can also <code>push()</code> data onto the end of an array.",
-        "Take the <code>myArray</code> array and <code>push()</code> this value to the end of it: <code>[\"dog\", 3]</code>."
+        "Push <code>[\"dog\", 3]</code> onto the end of the <code>myArray</code> variable."
       ],
       "tests": [
         "assert((function(d){if(d[2] != undefined && d[0] == 'John' && d[1] == 23 && d[2][0] == 'dog' && d[2][1] == 3 && d[2].length == 2){return true;}else{return false;}})(myArray), 'message: <code>myArray</code> should now equal <code>[\"John\", 23, [\"dog\", 3]]</code>.');"
       ],
       "challengeSeed": [
         "var ourArray = [\"Stimpson\", \"J\", [\"cat\"]];",
-        "ourArray.pop();",
-        "ourArray.push([\"happy\", \"joy\"]);",
-        "// ourArray now equals [\"Stimpson\", \"J\", [\"happy\", \"joy\"]].",
+        "",
+        "ourArray.pop(); // ourArray now equals [\"Stimpson\", \"J\"]",
+        "",
+        "ourArray.push([\"happy\", \"joy\"]); // ourArray now equals [\"Stimpson\", \"J\", [\"happy\", \"joy\"]]",
         "",
         "var myArray = [\"John\", 23, [\"cat\", 2]];",
+        "",
         "myArray.pop();",
-        "// Add a [\"dog\", 3] to the end of myArray using push().",
+        "",
         "// Only change code below this line.",
         "",
         "",
+        "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(z){return 'myArray = ' + JSON.stringify(z);})(myArray);"
       ],
       "type": "waypoint",
@@ -586,28 +586,29 @@
       "id": "bg9996c9c69feddfaeb9bdef",
       "title": "Manipulate Arrays With shift()",
       "description": [
-        "<code>pop()</code> always removes the last element of an array. What if you want to remove the first? That's where <code>.shift()</code> comes in.",
-        "Take the <code>myArray</code> array and <code>shift()</code> the first value off of it. Set <code>myRemoved</code> to the first value of <code>myArray</code> using <code>shift()</code>."
+        "<code>pop()</code> always removes the last element of an array. What if you want to remove the first?",
+        "That's where <code>.shift()</code> comes in. It works just like <code>.pop()</code>, except it removes the first element instead of the last.",
+        "Use the <code>.shift()</code> function to remove the first item from <code>myArray</code>, assigning the \"shifted off\" value to <code>removedFromMyArray</code>."
       ],
       "tests": [
         "assert((function(d){if(d[0] == 23 && d[1][0] == 'dog' && d[1][1] == 3 && d[2] == undefined){return true;}else{return false;}})(myArray), 'message: <code>myArray</code> should now equal <code>[23, [\"dog\", 3]]</code>.');",
-        "assert((function(d){if(d === 'John' && typeof(myRemoved) === 'string'){return true;}else{return false;}})(myRemoved), 'message: <code>myRemoved</code> should contain <code>\"John\"</code>.');"
+        "assert((function(d){if(d === 'John' && typeof(removedFromMyArray) === 'string'){return true;}else{return false;}})(removedFromMyArray), 'message: <code>removedFromMyArray</code> should contain <code>\"John\"</code>.');"
       ],
       "challengeSeed": [
         "var ourArray = [\"Stimpson\", \"J\", [\"cat\"]];",
-        "ourRemoved = ourArray.shift();",
-        "// ourArray now equals [\"J\", [\"cat\"]].",
+        "",
+        "removedFromOurArray = ourArray.shift(); // removedFromOurArray now equals \"Stimpson\" and ourArray now equals [\"J\", [\"cat\"]].",
         "",
         "var myArray = [\"John\", 23, [\"dog\", 3]];",
+        "",
         "// Only change code below this line.",
         "",
-        "var myRemoved = myArray; // This should be [\"John\"] and myArray should now be [23, [\"dog\", 3]].",
+        "var removedFromMyArray;",
         "",
         "// Only change code above this line.",
         "",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
-        "(function(y, z){return 'myArray = ' + JSON.stringify(y) + ' & myRemoved = ' + JSON.stringify(z);})(myArray, myRemoved);"
+        "",
+        "(function(y, z){return 'myArray = ' + JSON.stringify(y) + ' & removedFromMyArray = ' + JSON.stringify(z);})(myArray, removedFromMyArray);"
       ],
       "type": "waypoint",
       "challengeType": 1
@@ -616,39 +617,39 @@
       "id": "bg9997c9c69feddfaeb9bdef",
       "title": "Manipulate Arrays With unshift()",
       "description": [
-        "Now that we've learned how to <code>shift</code>things from the start of the array, we need to learn how to <code>unshift</code>stuff back to the start.",
-        "Let's take the code we had last time and <code>unshift</code>this value to the start: <code>\"Paul\"</code>."
+        "Not only can you <code>shift</code> elements off of the beginning of an array, you can also <code>unshift</code> elements onto the beginning of an array.",
+        "<code>unshift()</code> works exactly like <code>push()</code>, but instead of adding the element at the end of the array, <code>unshift()</code> adds the element at the beginning of the array.",
+        "Add <code>\"Paul\"</code> onto the beginning of the <code>myArray</code> variable using <code>unshift()</code>."
       ],
       "tests": [
         "assert((function(d){if(typeof(d[0]) === \"string\" && d[0].toLowerCase() == 'paul' && d[1] == 23 && d[2][0] != undefined && d[2][0] == 'dog' && d[2][1] != undefined && d[2][1] == 3){return true;}else{return false;}})(myArray), 'message: <code>myArray</code> should now have [\"Paul\", 23, [\"dog\", 3]]).');"
       ],
       "challengeSeed": [
         "var ourArray = [\"Stimpson\", \"J\", [\"cat\"]];",
-        "ourArray.shift();",
-        "// ourArray now equals [\"J\", [\"cat\"]]",
-        "ourArray.unshift(\"happy\");",
-        "// ourArray now equals [\"happy\", \"J\", [\"cat\"]]",
+        "",
+        "ourArray.shift(); // ourArray now equals [\"J\", [\"cat\"]]",
+        "",
+        "ourArray.unshift(\"happy\"); // ourArray now equals [\"happy\", \"J\", [\"cat\"]]",
         "",
         "var myArray = [\"John\", 23, [\"dog\", 3]];",
+        "",
         "myArray.shift();",
         "",
-        "// Add \"Paul\" to the start of myArray.",
         "// Only change code below this line.",
         "",
         "",
+        "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "(function(y, z){return 'myArray = ' + JSON.stringify(y);})(myArray);"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"bg9997c9c89feddfaeb9bdef",
+      "id": "bg9997c9c89feddfaeb9bdef",
       "title": "Write Reusable JavaScript with Functions",
-      "difficulty":"9.9819",
-      "description":[
+      "description": [
         "In JavaScript, we can divide up our code into reusable parts called functions.",
         "Here's an example of a function:",
         "<code>function functionName(a, b) {</code>",
@@ -659,10 +660,10 @@
         "In this example, the function will return the number <code>6</code> as this is the result of <code>4 + 2</code>.",
         "Create and call a function called <code>myFunction</code> that returns the sum of <code>a</code> and <code>b</code>."
       ],
-      "tests":[
+      "tests": [
         "assert((function(){if(typeof(f) !== \"undefined\" && f === a + b){return true;}else{return false;}})(), 'message: Your function should return the value of a + b');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "var a = 4;",
         "var b = 5;",
         "",
@@ -670,15 +671,13 @@
         "  return a - b;",
         "}",
         "",
-        "// Create a function called myFunction that returns the value of a plus b.",
         "// Only change code below this line.",
         "",
         "",
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "if(typeof(myFunction) !== \"undefined\"){",
         "var f=myFunction(a,b);",
         "(function(){return f;})();",
@@ -688,109 +687,191 @@
       "challengeType": 1
     },
     {
-      "id":"bg9998c9c99feddfaeb9bdef",
+      "id": "bg9998c9c99feddfaeb9bdef",
       "title": "Build JavaScript Objects",
-      "difficulty":"9.9822",
-      "description":[
+      "description": [
         "You may have heard the term <code>object</code> before.",
         "Objects are similar to <code>arrays</code>, except that instead of using indexes to access and modify their data, you access the data in objects through what are called <code>properties</code>.",
         "Here's a sample object:",
         "<code>var cat = {</code>",
-        "<code>  \"name\": \"Whiskers\",</code>",
-        "<code>  \"legs\": 4,</code>",
-        "<code>  \"tails\": 1,</code>",
-        "<code>  \"enemies\": [\"Water\", \"Dogs\"]</code>",
+        "<code>&thinsp;&thinsp;\"name\": \"Whiskers\",</code>",
+        "<code>&thinsp;&thinsp;\"legs\": 4,</code>",
+        "<code>&thinsp;&thinsp;\"tails\": 1,</code>",
+        "<code>&thinsp;&thinsp;\"enemies\": [\"Water\", \"Dogs\"]</code>",
         "<code>};</code>",
         "</code>",
         "Objects are useful for storing data in a structured way, and can represent real world objects, like a cat.",
-        "Let's try to make an object that represents a dog called <code>myDog</code> which contains the properties <code>'name'</code> (String), <code>'legs'</code> (Number), <code>'tails'</code> (Number) and <code>'friends'</code> (Array)!"
+        "Let's try to make an object that represents a dog called <code>myDog</code> which contains the properties <code>\"name\"</code> (a string), <code>\"legs\"</code>, <code>\"tails\"</code> and <code>\"friends\"</code>.",
+        "You can set these object properties to whatever values you want, as long <code>\"name\"</code> is a string, <code>\"legs\"</code> and <code>\"tails\"</code> are numbers, and <code>\"friends\"</code> is an array."
       ],
-      "tests":[
+      "tests": [
         "assert((function(z){if(z.hasOwnProperty(\"name\") && z.name !== undefined && typeof(z.name) === \"string\"){return true;}else{return false;}})(myDog), 'message: <code>myDog</code> should contain the property <code>name</code> and it should be a <code>string</code>.');",
         "assert((function(z){if(z.hasOwnProperty(\"legs\") && z.legs !== undefined && typeof(z.legs) === \"number\"){return true;}else{return false;}})(myDog), 'message: <code>myDog</code> should contain the property <code>legs</code> and it should be a <code>number</code>.');",
         "assert((function(z){if(z.hasOwnProperty(\"tails\") && z.tails !== undefined && typeof(z.tails) === \"number\"){return true;}else{return false;}})(myDog), 'message: <code>myDog</code> should contain the property <code>tails</code> and it should be a <code>number</code>.');",
         "assert((function(z){if(z.hasOwnProperty(\"friends\") && z.friends !== undefined && Array.isArray(z.friends)){return true;}else{return false;}})(myDog), 'message: <code>myDog</code> should contain the property <code>friends</code> and it should be an <code>array</code>.');"
       ],
-      "challengeSeed":[
-        "// var ourDog = {",
-        "//   \"name\": \"Camper\",",
-        "//   \"legs\": 4,",
-        "//   \"tails\": 1,",
-        "//   \"friends\": [\"everything!\"]",
-        "// };",
-        "",
-        "// Add the name (string), legs (number), tails (number) and friends (array) properties to myDog.",
-        "// You can set them to whatever you want.",
+      "challengeSeed": [
+        "var ourDog = {",
+        "  \"name\": \"Camper\",",
+        "  \"legs\": 4,",
+        "  \"tails\": 1,",
+        "  \"friends\": [\"everything!\"]",
+        "};",
         "",
         "// Only change code below this line.",
         "",
         "var myDog = {",
-        "   ",
+        "",
+        "",
+        "",
+        "",
         "};",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
+        "",
         "(function(z){return z;})(myDog);"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"bg9999c9c99feddfaeb9bdef",
-      "title": "Manipulate JavaScript Objects",
-      "difficulty":"9.9823",
-      "description":[
-        "There are many ways to add and remove properties from objects.",
-        "For example, we can add properties to objects like this:",
-        "<code>myObject.myProperty = \"myValue\";</code>",
-        "We can also delete them like this:",
-        "<code>delete myObject.myProperty;</code>",
-        "Let's add the property <code>\"bark\"</code>, and delete the property <code>\"tails\"</code>."
+      "id": "bg9999c9c99feddfaeb9bdef",
+      "title": "Update the Properties of a JavaScript Object",
+      "description": [
+        "After you've created a JavaScript object, you can update its properties at any time just like you would update any other variable.",
+        "For example, let's look at <code>ourDog</code>:",
+        "<code>var ourDog = {</code>",
+        "<code>&thinsp;&thinsp;\"name\": \"Camper\",</code>",
+        "<code>&thinsp;&thinsp;\"legs\": 4,</code>",
+        "<code>&thinsp;&thinsp;\"tails\": 1,</code>,",
+        "<code>&thinsp;&thinsp;\"friends\": [\"everything!\"]</code>",
+        "<code>};</code>",
+        "Since he's a particularly happy dog, let's change his name to \"Happy Camper\". Here's how we update his object's name property:",
+        "<code>myDog.name = \"Happy Camper\";</code>",
+        "Now when we run <code>return myDog.name</code>, instead of getting \"Camper\", we'll get his new name, \"Happy Camper\".",
+        "Let's update <code>yourDog</code> object's name property. Let's change her name from \"Coder\" to \"Happy Coder\"."
       ],
-      "tests":[
-        "assert(myDog.bark !== undefined, 'message: Add the property <code>\"bark\"</code> to <code>myDog</code>.');",
+      "tests": [
+        "assert(/happy coder/gi.test(myDog.name), 'message: Update <code>myDog</code>\\'s <code>\"name\"</code> property to equal \"Happy Coder\".');"
+      ],
+      "challengeSeed": [
+        "var ourDog = {",
+        "  \"name\": \"Camper\",",
+        "  \"legs\": 4,",
+        "  \"tails\": 1,",
+        "  \"friends\": [\"everything!\"]",
+        "};",
+        "",
+        "ourDog.name = \"Happy Camper\";",
+        "",
+        "var myDog = {",
+        "  \"name\": \"Coder\",",
+        "  \"legs\": 4,",
+        "  \"tails\": 1,",
+        "  \"friends\": [\"Free Code Camp Campers\"]",
+        "};",
+        "",
+        "// Only change code above this line.",
+        "",
+        "(function(z){return z;})(myDog);"
+      ],
+      "type": "waypoint",
+      "challengeType": 1
+    },
+    {
+      "id": "bg9999c9c99feedfaeb9bdef",
+      "title": "Add New Properties to a JavaScript Object",
+      "description": [
+        "You can add new properties to existing JavaScript objects the same way you would modify them.",
+        "Here's how we would add a <code>\"bark\"</code> property to <code>ourDog</code>:",
+        "<code>myDog.bark = \"bow-wow\";</code>",
+        "Now when we run <code>return myDog.bark</code>, we'll get his bark, \"bow-wow\".",
+        "Let's add a <code>\"bark\"</code> property to <code>myDog</code> and set it to a dog sound, such as \"woof\"."
+      ],
+      "tests": [
+        "assert(myDog.bark !== undefined, 'message: Add the property <code>\"bark\"</code> to <code>myDog</code>.');"
+      ],
+      "challengeSeed": [
+        "var ourDog = {",
+        "  \"name\": \"Camper\",",
+        "  \"legs\": 4,",
+        "  \"tails\": 1,",
+        "  \"friends\": [\"everything!\"]",
+        "};",
+        "",
+        "ourDog.bark = \"bow-wow\";",
+        "",
+        "var myDog = {",
+        "  \"name\": \"Happy Coder\",",
+        "  \"legs\": 4,",
+        "  \"tails\": 1,",
+        "  \"friends\": [\"Free Code Camp Campers\"]",
+        "};",
+        "",
+        "// Only change code below this line.",
+        "",
+        "",
+        "",
+        "// Only change code above this line.",
+        "",
+        "(function(z){return z;})(myDog);"
+      ],
+      "type": "waypoint",
+      "challengeType": 1
+    },
+    {
+      "id": "bg9999c9c99fdddfaeb9bdef",
+      "title": "Delete Properties from a JavaScript Object",
+      "description": [
+        "We can also delete properties from objects like this:",
+        "<code>delete myDog.bark;</code>",
+        "Let's delete the <code>\"tails\"</code> property from <code>myDog</code>."
+      ],
+      "tests": [
         "assert(myDog.tails === undefined, 'message: Delete the property <code>\"tails\"</code> from <code>myDog</code>.');"
       ],
-      "challengeSeed":[
-        "// var ourDog = {",
-        "//   \"name\": \"Camper\",",
-        "//   \"legs\": 4,",
-        "//   \"tails\": 1,",
-        "//   \"friends\": [\"everything!\"]",
-        "// };",
+      "challengeSeed": [
+        "var ourDog = {",
+        "  \"name\": \"Camper\",",
+        "  \"legs\": 4,",
+        "  \"tails\": 1,",
+        "  \"friends\": [\"everything!\"],",
+        "  \"bark\": \"bow-wow\"",
+        "};",
         "",
-        "// ourDog.bark = \"arf!\";",
-        "// delete ourDog.tails;",
+        "delete ourDog.bark;",
         "",
         "var myDog = {",
-        "   \"name\": \"Camper\",",
-        "   \"legs\": 4,",
-        "   \"tails\": 1,",
-        "   \"friends\": []",
+        "  \"name\": \"Happy Coder\",",
+        "  \"legs\": 4,",
+        "  \"tails\": 1,",
+        "  \"friends\": [\"Free Code Camp Campers\"],",
+        "  \"bark\": \"woof\"",
         "};",
         "",
         "// Only change code below this line.",
         "",
-        "// Let's add the property bark to myDog",
-        "",
-        "",
-        "// Now delete the property tails",
         "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
+        "",
         "(function(z){return z;})(myDog);"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c11feddfaeb5bdef",
+      "id": "cf1111c1c11feddfaeb5bdef",
       "title": "Iterate with JavaScript For Loops",
-      "difficulty":"9.9824",
-      "description":[
+      "description": [
         "You can run the same code multiple times by using a loop.",
         "The most common type of JavaScript loop is called a \"for loop\" because it runs \"for\" a specific number of times.",
+        "For loops are declared with three optional expressions seperated by semicolons:",
+        "<code>for([initialization]; [condition]; [final-expression])</code>",
+        "The <code>initialization</code> statement is executed one time only before the loop starts. It is typically used to define and setup your loop varaible.",
+        "The <code>condition</code> statement is evaluated at the beginning of every loop and will continue as long as it evalutes <code>true</code>. When <code>condition</code> is <code>false</code> at the start of the loop, the loop will stop executing.  This means if <code>condition</code> starts as <code>false</code>, your loop will never execute.",
+        "The <code>final-expression</code> is executed at the end of each loop iteration, prior to the next <code>condition</code> check and is usually used to increment or decrement your loop counter.",
+        "We'll initialize with <code>i = 0</code> and loop while our condition <code>i < 5</code> is true.  We'll increment <code>i</code> by 1 each loop with <code>i++</code> as our <code>final-expression</code>.",
         "<code>var ourArray = [];</code>",
         "<code>for(var i = 0; i < 5; i++) {</code>",
         "<code>&thinsp;&thinsp;ourArray.push(i);</code>",
@@ -798,24 +879,25 @@
         "<code>ourArray</code> will now contain [0,1,2,3,4] ",
         "Let's try getting a for loop to work by pushing values to an array."
       ],
-      "tests":[
-        "assert(editor.getValue().match(/for/g), 'message: You should be using a <code>for</code> loop for this.');",
-        "assert.deepEqual(myArray, [0,1,2,3,4], 'message: <code>myArray</code> should equal [0,1,2,3,4].');"
+      "tests": [
+        "assert(editor.getValue().match(/for\\s*\\(/g).length > 1, 'message: You should be using a <code>for</code> loop for this.');",
+        "assert.deepEqual(myArray, [0,1,2,3,4], 'message: <code>myArray</code> should equal <code>[0,1,2,3,4]</code>');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "var ourArray = [];",
+        "",
         "for(var i = 0; i < 5; i++){",
         "  ourArray.push(i);",
         "}",
+        "",
         "var myArray = [];",
         "",
         "// Only change code below this line.",
         "",
-        "// Push the numbers zero through four to myArray using a \"for loop\" like above.",
+        "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "if(typeof(myArray) !== \"undefined\"){(function(){return myArray;})();}",
         ""
       ],
@@ -823,10 +905,88 @@
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c11feddfaeb1bdef",
-      "title": "Iterate with JavaScript While Loops",
-      "difficulty":"9.9825",
+      "id":"56104e9e514f539506016a5c",
+      "title": "Iterate Odd Numbers With a For Loop",
       "description":[
+        "For loops don't have to iterate one at a time. By changing our <code>final-expression</code>, we can count by even numbers.",
+        "We'll start at <code>i = 0</code> and loop while <code>i < 10</code>.  We'll increment <code>i</code> by 2 each loop with <code>i += 2</code>.",
+        "<code>var ourArray = [];</code>",
+        "<code>for(var i = 0; i < 10; i += 2) {</code>",
+        "<code>&thinsp;&thinsp;ourArray.push(i);</code>",
+        "<code>}</code>",
+        "<code>ourArray</code> will now contain [0,2,4,6,8] ",
+        "Let's change our <code>initialization</code> and <code>final-expression</code> so we can count by odd numbers.",
+        "Push the odd numbers from 1 through 9 to <code>myArray</code> using a <code>for loop</code>."
+      ],
+      "tests":[
+        "assert(editor.getValue().match(/for\\s*\\(/g).length > 1, 'message: You should be using a <code>for</code> loop for this.');",
+        "assert.deepEqual(myArray, [1,3,5,7,9], 'message: <code>myArray</code> should equal <code>[1,3,5,7,9]</code>');"
+      ],
+      "challengeSeed":[
+        "var ourArray = [];",
+        "",
+        "for(var i = 1; i < 10; i += 2){",
+        "  ourArray.push(i);",
+        "}",
+        "",
+        "var myArray = [];",
+        "",
+        "// Only change code below this line.",
+        "",
+        "",
+        "",
+        "// Only change code above this line.",
+        "",
+        "if(typeof(myArray) !== \"undefined\"){(function(){return myArray;})();}",
+        ""
+      ],
+      "type": "waypoint",
+      "challengeType": 1
+    },
+    {
+      "id":"56105e7b514f539506016a5e",
+      "title": "Count Backwards With a For Loop",
+      "description":[
+        "A for loop can also count backwards, so long as we can define the right conditions.",
+        "In order to count backwards by twos, we'll need to change our <code>initialization</code>, <code>condition</code>, and <code>final-expression</code>.",
+        "We'll start at <code>i = 10</code> and loop while <code>i > 0</code>.  We'll decrement <code>i</code> by 2 each loop with <code>i -= 2</code>.",
+        "<code>var ourArray = [];</code>",
+        "<code>for(var i = 10; i > 0; i -= 2) {</code>",
+        "<code>&thinsp;&thinsp;ourArray.push(i);</code>",
+        "<code>}</code>",
+        "<code>ourArray</code> will now contain <code>[10,8,6,4,2]</code>",
+        "Let's change our <code>initialization</code> and <code>final-expression</code> so we can count backward by twos for numbers.",
+        "Push the odd numbers from 9 through 1 to <code>myArray</code> using a <code>for loop</code>."
+      ],
+      "tests":[
+        "assert(editor.getValue().match(/for\\s*\\(/g).length > 1, 'message: You should be using a <code>for</code> loop for this.');",
+        "assert.deepEqual(myArray, [9,7,5,3,1], 'message: <code>myArray</code> should equal <code>[9,7,5,3,1]</code>');"
+      ],
+      "challengeSeed":[
+        "var ourArray = [];",
+        "",
+        "for(var i = 10; i > 0; i -= 2){",
+        "  ourArray.push(i);",
+        "}",
+        "",
+        "var myArray = [];",
+        "",
+        "// Only change code below this line.",
+        "",
+        "",
+        "",
+        "// Only change code above this line.",
+        "",
+        "if(typeof(myArray) !== \"undefined\"){(function(){return myArray;})();}",
+        ""
+      ],
+      "type": "waypoint",
+      "challengeType": 1
+    },
+    {
+      "id": "cf1111c1c11feddfaeb1bdef",
+      "title": "Iterate with JavaScript While Loops",
+      "description": [
         "You can run the same code multiple times by using a loop.",
         "Another type of JavaScript loop is called a \"while loop\", because it runs \"while\" something is true and stops once that something is no longer true.",
         "<code>var ourArray = [];</code>",
@@ -835,21 +995,22 @@
         "<code>&thinsp;&thinsp;ourArray.push(i);</code>",
         "<code>&thinsp;&thinsp;i++;</code>",
         "<code>}</code>",
-        "Let's try getting a while loop to work by pushing values to an array."
+        "Let's try getting a while loop to work by pushing values to an array.",
+        "Push the numbers 0 through 4 to <code>myArray</code> using a <code>while loop</code>."
       ],
-      "tests":[
+      "tests": [
         "assert(editor.getValue().match(/while/g), 'message: You should be using a <code>while</code> loop for this.');",
-        "assert.deepEqual(myArray, [0,1,2,3,4], 'message: <code>myArray</code> should equal [0,1,2,3,4].');"
+        "assert.deepEqual(myArray, [0,1,2,3,4], 'message: <code>myArray</code> should equal <code>[0,1,2,3,4]</code>');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "var myArray = [];",
+        "",
         "// Only change code below this line.",
         "",
-        "// Push the numbers zero through four to myArray using a \"while loop\".",
+        "",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
-        "// You'll learn about functions soon.",
+        "",
         "if(typeof(myArray) !== \"undefined\"){(function(){return myArray;})();}",
         ""
       ],
@@ -857,22 +1018,22 @@
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c11feddfaeb9bdef",
+      "id": "cf1111c1c11feddfaeb9bdef",
       "title": "Generate Random Fractions with JavaScript",
-      "difficulty":"9.9827",
-      "description":[
+      "description": [
         "Random numbers are useful for creating random behavior.",
         "JavaScript has a <code>Math.random()</code> function that generates a random decimal number.",
-        "Use <code>Math.random()</code> to get <code>myFunction</code> to return a random number."
+        "Change <code>myFunction</code> to return a random number instead of returning <code>0</code>.",
+        "Note that you can return a function, just like you would return a variable or value."
       ],
-      "tests":[
+      "tests": [
         "assert(typeof(myFunction()) === \"number\", 'message: <code>myFunction</code> should return a random number.');",
         "assert((myFunction()+''). match(/\\./g), 'message: The number returned by <code>myFunction</code> should be a decimal.');",
-        "assert(editor.getValue().match(/Math\\.random/g).length >= 2, 'message: You should be using <code>Math.random</code> to generate the random decimal number.');"
+        "assert(editor.getValue().match(/Math\\.random/g).length >= 0, 'message: You should be using <code>Math.random</code> to generate the random decimal number.');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "function myFunction() {",
-        "  // Change the 0 to Math.random().",
+        "",
         "  // Only change code below this line.",
         "",
         "  return 0;",
@@ -880,33 +1041,36 @@
         "  // Only change code above this line.",
         "}",
         "",
-        "// We use this function to show you the value of your variable in your output box.",
         "(function(){return myFunction();})();"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c12feddfaeb1bdef",
+      "id": "cf1111c1c12feddfaeb1bdef",
       "title": "Generate Random Whole Numbers with JavaScript",
-      "difficulty":"9.9828",
-      "description":[
-        "It's great that we can create random decimal numbers, but it's even more useful if we use it to generate a random whole number.",
-        "To achieve this we can multiply the random number by ten and use the <code>Math.floor()</code> to convert the decimal number to the nearest less than or equal whole number.",
-        "This technique gives us a whole number between zero and nine.",
-        "Example:",
-        "<code>Math.floor(Math.random()*10);</code>",
-        "Let's give this technique a go now."
+      "description": [
+        "It's great that we can generate random decimal numbers, but it's even more useful if we use it to generate random whole numbers.",
+        "First, let's use <code>Math.random()</code> to generate a random decimal.",
+        "Then let's multiply this random decimal by 20.",
+        "Finally, let's use another function, <code>Math.floor()</code> to round the number down to its nearest whole number.",
+        "This technique will gives us a whole number between 0 and 19.",
+        "Note that because we're rounding down, it's impossible to actually get 20.",
+        "Putting everything together, this is what our code looks like:",
+        "<code>Math.floor(Math.random() * 20);</code>",
+        "See how <code>Math.floor</code> takes <code>(Math.random() * 20)</code> as its argument? That's right - you can pass a function to another function as an argument.",
+        "Let's use this technique to generate and return a random whole number between 0 and 9."
       ],
-      "tests":[
+      "tests": [
         "assert(typeof(myFunction()) === \"number\", 'message: The result of <code>myFunction</code> should be a number.');",
-        "assert(editor.getValue().match(/Math.random/g), 'message: You should be using Math.random to create a random number.');",
+        "assert(editor.getValue().match(/Math.random/g), 'message: You should be using Math.random to generate a random number.');",
         "assert(editor.getValue().match(/\\(\\s*?Math.random\\s*?\\(\\s*?\\)\\s*?\\*\\s*?10\\s*?\\)/g) || editor.getValue().match(/\\(\\s*?10\\s*?\\*\\s*?Math.random\\s*?\\(\\s*?\\)\\s*?\\)/g), 'message: You should have multiplied the result of <code>Math.random</code> by 10 to make it a number that is between zero and nine.');",
         "assert(editor.getValue().match(/Math.floor/g), 'message: You should use <code>Math.floor</code> to remove the decimal part of the number.');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
+        "var randomNumberBetween0and19 = Math.floor(Math.random() * 20);",
+        "",
         "function myFunction(){",
-        "  // Make myFunction return a random number between zero and nine instead of a decimal.",
         "",
         "  // Only change code below this line.",
         "",
@@ -915,53 +1079,67 @@
         "  // Only change code above this line.",
         "}",
         "",
-        "// We use this function to show you the value of your variable in your output box.",
         "(function(){return myFunction();})();"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c12feddfaeb2bdef",
+      "id": "cf1111c1c12feddfaeb2bdef",
       "title": "Generate Random Whole Numbers within a Range",
-      "difficulty":"9.9829",
-      "description":[
-        "We can use a certain mathematical expression to get a random number between two numbers.",
+      "description": [
+        "Instead of generating a random number between zero and a given number like we did before, we can generate a random number that falls within a range of two specific numbers.",
+        "To do this, we'll define a minimum number <code>min</code> and a maximum number <code>max</code>.",
+        "Here's the formula we'll use. Take a moment to read it and try to understand what this code is doing:",
         "<code>Math.floor(Math.random() * (max - min + 1)) + min</code>",
-        "By using this, we can control the output of a random number."
+        "Define two variables: <code>myMin</code> and </code>myMax</code>, and set them both equal to numbers.",
+        "Then create a function called <code>myFunction</code> that returns a random number that's greater than or equal to <code>myMin</code>, and is less than <code>myMax</code>."
       ],
-      "tests":[
-        "assert(myFunction() >= min, 'message: The random number generated by <code>myFunction</code> should be greater than or equal to the minimum number.');",
-        "assert(myFunction() <= max, 'message: The random number generated by <code>myFunction</code> should be less than or equal to the maximum number.');",
+      "tests": [
+        "assert(myFunction() >= myMin, 'message: The random number generated by <code>myFunction</code> should be greater than or equal to your minimum number, <code>myMin</code>.');",
+        "assert(myFunction() <= myMax, 'message: The random number generated by <code>myFunction</code> should be less than or equal to your maximum number, <code>myMax</code>.');",
         "assert(myFunction() % 1 === 0 , 'message: The random number generated by <code>myFunction</code> should be an integer, not a decimal.');",
-        "assert((function(){if(editor.getValue().match(/max/g).length >= 2 && editor.getValue().match(/min/g).length >= 2 && editor.getValue().match(/Math.floor/g) && editor.getValue().match(/Math.random/g)){return true;}else{return false;}})(), 'message: You should be using the function given in the description to calculate the random in number in a range.');"
+        "assert((function(){if(editor.getValue().match(/myMax/g).length > 1 && editor.getValue().match(/myMin/g).length > 2 && editor.getValue().match(/Math.floor/g) && editor.getValue().match(/Math.random/g)){return true;}else{return false;}})(), 'message: <code>myFunction()</code> should use use both <code>myMax</code> and <code>myMin</code>, and return a random number in your range.');"
       ],
-      "challengeSeed":[
-        "var min = 0;",
-        "var max = 9;",
-        "function myFunction() {",
-        "  // Make myFunction return a random number between min and max values instead of a decimal",
-        "  // Only change code below this line.",
+      "challengeSeed": [
+        "var ourMin = 1;",
+        "",
+        "var ourMax = 9;",
+        "",
+        "function ourFunction() {",
+        "",
+        "  return Math.floor(Math.random() * (ourMax - ourMin + 1)) + ourMin;",
+        "",
+        "}",
+        "",
+        "// Only change code below this line.",
+        "",
+        "var myMin;",
+        "",
+        "var myMax;",
+        "",
+        "function myFunction() {",
+        "",
+        "  return;",
         "",
-        "  return Math.random();",
         "}",
         "",
         "// Only change code above this line.",
-        "// We use this function to show you the value of your variable in your output box.",
+        "",
+        "",
         "(function(){return myFunction();})();"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c12feddfaeb3bdef",
+      "id": "cf1111c1c12feddfaeb3bdef",
       "title": "Use Conditional Logic with If and Else Statements",
-      "difficulty":"9.983",
-      "description":[
+      "description": [
         "We can use <code>if</code> statements in JavaScript to only execute code if a certain condition is met.",
         "<code>if</code> statements require some sort of boolean condition to evaluate.",
         "For example:",
-        "<code> if (1 === 2) {</code>",
+        "<code>if (1 === 2) {</code>",
         "<code>&thinsp;&thinsp;return true;</code>",
         "<code>} else {</code>",
         "<code>&thinsp;&thinsp;return false;</code>",
@@ -969,58 +1147,59 @@
         "Let's use <code>if</code> and <code>else</code> statements to make a coin-flip game.",
         "Create <code>if</code> and <code>else</code> statements to return the string <code>\"heads\"</code> if the flip variable is zero, or else return the string <code>\"tails\"</code> if the flip variable is not zero."
       ],
-      "tests":[
+      "tests": [
+        "assert(editor.getValue().match(/if/g).length >= 2, 'message: Create a new if statement.');",
+        "assert(editor.getValue().match(/else/g).length >= 1, 'message: Created a new else statement.');",
         "assert((function(){var result = myFunction();if(result === 'heads' || result === 'tails'){return true;} else {return false;}})(), 'message: <code>myFunction</code> should either return <code>heads</code> or <code>tails</code>.');",
-        "assert((function(){var result = myFunction();if(result === 'heads' && flip === 0 || result === 'tails' && flip !== 0){return true;} else {return false;}})(), 'message: <code>myFunction</code> should return <code>heads</code> when flip equals 0 and <code>tails</code> when flip equals 1.');",
-        "assert(editor.getValue().match(/if/g).length >= 4, 'message: You should have created a new if statement.');",
-        "assert(editor.getValue().match(/else/g).length >= 2, 'message: You should have created a new else statement.');"
+        "assert((function(){var result = myFunction();if(result === 'heads' && flip === 0 || result === 'tails' && flip !== 0){return true;} else {return false;}})(), 'message: <code>myFunction</code> should return <code>heads</code> when flip equals 0 and <code>tails</code> when flip equals 1.');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "var flip = Math.floor(Math.random() * (1 - 0 + 1)) + 0;",
-        "function myFunction(){",
-        "  // Create an if-else statement here to return \"heads\" if flip is 0. Otherwise return \"tails\".",
+        "",
+        "function myFunction() {",
         "",
         "  // Only change code below this line.",
         "",
         "",
         "",
         "  // Only change code above this line.",
+        "",
         "}",
         "",
-        "// We use this function to show you the value of your variable in your output box.",
         "var result = myFunction();if(typeof(flip) !== \"undefined\" && typeof(flip) === \"number\" && typeof(result) !== \"undefined\" && typeof(result) === \"string\"){(function(y,z){return 'flip = ' + y.toString() + ', text = ' + z;})(flip, result);}"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c12feddfaeb6bdef",
+      "id": "cf1111c1c12feddfaeb6bdef",
       "title": "Sift through Text with Regular Expressions",
-      "difficulty":"9.984",
-      "description":[
+      "description": [
         "<code>Regular expressions</code> are used to find certain words or patterns inside of <code>strings</code>.",
-        "For example, if we wanted to find the word <code>the</code> in the string <code>The dog chased the cat</code>, we could use the following <code>regular expression</code>: <code>\/the\/gi</code>",
+        "For example, if we wanted to find the word <code>the</code> in the string <code>The dog chased the cat</code>, we could use the following <code>regular expression</code>: <code>/the/gi</code>",
         "Let's break this down a bit:",
         "<code>the</code> is the pattern we want to match.",
         "<code>g</code> means that we want to search the entire string for this pattern instead of just the first match.",
         "<code>i</code> means that we want to ignore the case (uppercase or lowercase) when searching for the pattern.",
         "<code>Regular expressions</code> are written by surrounding the pattern with <code>/</code> symbols.",
-        "Let's try selecting all the occurrences of the word <code>and</code> in the string <code>Ada Lovelace and Charles Babbage designed the first computer and the software that would have run on it</code>. We can do this by replacing the <code>.</code> part of our regular expression with the current <code>regular expression</code> with the word <code>and</code>."
+        "Let's try selecting all the occurrences of the word <code>and</code> in the string <code>Ada Lovelace and Charles Babbage designed the first computer and the software that would have run on it</code>.",
+        "We can do this by replacing the <code>.</code> part of our regular expression with the current <code>regular expression</code> with the word <code>and</code>."
       ],
-      "tests":[
+      "tests": [
         "assert(test==2, 'message: Your <code>regular expression</code> should find two occurrences of the word <code>and</code>.');",
-        "assert(editor.getValue().match(/\\/and\\/gi/), 'message: You should have used <code>regular expressions</code> to find the word <code>and</code>.');"
+        "assert(editor.getValue().match(/\\/and\\/gi/), 'message: Use <code>regular expressions</code> to find the word <code>and</code> in <code>testString</code>.');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "var test = (function() {",
         "  var testString = \"Ada Lovelace and Charles Babbage designed the first computer and the software that would have run on it.\";",
         "  var expressionToGetSoftware = /software/gi;",
+        "",
         "  // Only change code below this line.",
         "",
         "  var expression = /./gi;",
         "",
         "  // Only change code above this line.",
-        "  // We use this function to show you the value of your variable in your output box.",
+        "",
         "  return testString.match(expression).length;",
         "})();(function(){return test;})();"
       ],
@@ -1028,22 +1207,22 @@
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c12feddfaeb7bdef",
+      "id": "cf1111c1c12feddfaeb7bdef",
       "title": "Find Numbers with Regular Expressions",
-      "difficulty":"9.985",
-      "description":[
+      "description": [
         "We can use special selectors in <code>Regular Expressions</code> to select a particular type of value.",
         "One such selector is the digit selector <code>\\d</code> which is used to grab the numbers in a string.",
         "It is used like this: <code>/\\d/g</code>.",
         "For numbers this is often written as <code>/\\d+/g</code>, where the <code>+</code> following the digit selector allows this regular expression to match multi-digit numbers.",
         "Use the <code>\\d</code> selector to select the number of numbers in the string, allowing for the possibility of multi-digit numbers."
       ],
-      "tests":[
-        "assert(test === 2, 'message: Your RegEx should have found two numbers in the <code>testString</code>.');",
-        "assert(editor.getValue().match(/\\/\\\\d\\+\\//g), 'message: You should be using the following expression <code>/\\d+/g</code> to find the numbers in the <code>testString</code>.');"
+      "tests": [
+        "assert(editor.getValue().match(/\\/\\\\d\\+\\//g), 'message: Use the <code>/\\d+/g</code> regular expression to find the numbers in <code>testString</code>.');",
+        "assert(test === 2, 'message: Your regular expression should find two numbers in <code>testString</code>.');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "var test = (function() {",
+        "",
         "  var testString = \"There are 3 cats but 4 dogs.\";",
         "",
         "  // Only change code below this line.",
@@ -1051,29 +1230,29 @@
         "  var expression = /.+/g;",
         "",
         "  // Only change code above this line.",
-        "  // We use this function to show you the value of your variable in your output box.",
+        "",
         "  return testString.match(expression).length;",
+        "",
         "})();(function(){return test;})();"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c12feddfaeb8bdef",
+      "id": "cf1111c1c12feddfaeb8bdef",
       "title": "Find Whitespace with Regular Expressions",
-      "difficulty":"9.986",
-      "description":[
-        "We can also use selectors like <code>\\s</code> to find whitespace in a string.",
-        "The whitespace characters are <code>\" \"</code> (space), <code>\\r</code> (carriage return), <code>\\n</code> (newline), <code>\\t</code> (tab), and <code>\\f</code> (form feed).",
-        "It is used like this:",
+      "description": [
+        "We can also use regular expression selectors like <code>\\s</code> to find whitespace in a string.",
+        "The whitespace characters are <code>\" \"</code> (space), <code>\\r</code> (the carriage return), <code>\\n</code> (newline), <code>\\t</code> (tab), and <code>\\f</code> (the form feed).",
+        "The whitespace regular expression looks like this:",
         "<code>/\\s+/g</code>",
-        "Select all the whitespace characters in the sentence string."
+        "Use it to select all the whitespace characters in the sentence string."
       ],
-      "tests":[
-        "assert(test === 7, 'message: Your RegEx should have found seven spaces in the <code>testString</code>.');",
-        "assert(editor.getValue().match(/\\/\\\\s\\+\\//g), 'message: You should be using the following expression <code>/\\s+/g</code> to find the spaces in the <code>testString</code>.');"
+      "tests": [
+        "assert(editor.getValue().match(/\\/\\\\s\\+\\//g), 'message: Use the <code>/\\s+/g</code> regular expression to find the spaces in <code>testString</code>.');",
+        "assert(test === 7, 'message: Your regular expression should find seven spaces in <code>testString</code>.');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "var test = (function(){",
         "  var testString = \"How many spaces are there in this sentence?\";",
         "",
@@ -1082,26 +1261,27 @@
         "  var expression = /.+/g;",
         "",
         "  // Only change code above this line.",
-        "  // We use this function to show you the value of your variable in your output box.",
+        "",
         "  return testString.match(expression).length;",
+        "",
         "})();(function(){return test;})();"
       ],
       "type": "waypoint",
       "challengeType": 1
     },
     {
-      "id":"cf1111c1c13feddfaeb3bdef",
+      "id": "cf1111c1c13feddfaeb3bdef",
       "title": "Invert Regular Expression Matches with JavaScript",
-      "difficulty":"9.987",
-      "description":[
-        "Use <code>/\\S/g</code> to match everything that isn't a space in the string.",
-        "You can invert any match by using the uppercase version of the selector <code>\\s</code> versus <code>\\S</code> for example."
+      "description": [
+        "You can invert any match by using the uppercase version of the regular expression selector.",
+        "For example, <code>\\s</code> will match any whitespace, and <code>\\S</code> will match anything that isn't whitespace.",
+        "Use <code>/\\S/g</code> to count the number of non-whitespace characters in <code>testString</code>."
       ],
-      "tests":[
-        "assert(test === 49, 'message: Your RegEx should have found forty nine non-space characters in the <code>testString</code>.');",
-        "assert(editor.getValue().match(/\\/\\\\S\\/g/g), 'message: You should be using the following expression <code>/\\S/g</code> to find non-space characters in the <code>testString</code>.');"
+      "tests": [
+        "assert(editor.getValue().match(/\\/\\\\S\\/g/g), 'message: Use the <code>/\\S/g</code> regular expression to find non-space characters in <code>testString</code>.');",
+        "assert(test === 49, 'message: Your regular expression should find forty nine non-space characters in the <code>testString</code>.');"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "var test = (function(){",
         "  var testString = \"How many non-space characters are there in this sentence?\";",
         "",
@@ -1110,31 +1290,30 @@
         "  var expression = /./g;",
         "",
         "  // Only change code above this line.",
-        "  // We use this function to show you the value of your variable in your output box.",
+        "",
         "  return testString.match(expression).length;",
         "})();(function(){return test;})();"
       ],
       "type": "waypoint",
-      "challengeType":1
+      "challengeType": 1
     },
     {
-      "id":"cf1111c1c12feddfaeb9bdef",
+      "id": "cf1111c1c12feddfaeb9bdef",
       "title": "Create a JavaScript Slot Machine",
-      "difficulty":"9.988",
-      "description":[
+      "description": [
         "We are now going to try and combine some of the stuff we've just learned and create the logic for a slot machine game.",
         "For this we will need to generate three random numbers between <code>1</code> and <code>3</code> to represent the possible values of each individual slot.",
         "Store the three random numbers in <code>slotOne</code>, <code>slotTwo</code> and <code>slotThree</code>.",
         "Generate the random numbers by using the system we used earlier (an explanation of the formula can be found <a href=\"https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Waypoint-Generate-Random-Whole-Numbers-within-a-Range#explanation\">here</a>):",
         "<code>Math.floor(Math.random() * (3 - 1 + 1)) + 1;</code>"
       ],
-      "tests":[
-        "assert(typeof(runSlots($(\".slot\"))[0]) === \"number\", '<code>slotOne</code> should be a random number.')",
-        "assert(typeof(runSlots($(\".slot\"))[1]) === \"number\", '<code>slotTwo</code> should be a random number.')",
-        "assert(typeof(runSlots($(\".slot\"))[2]) === \"number\", '<code>slotThree</code> should be a random number.')",
-        "assert((function(){if(editor.match(/Math\\.floor\\(\\s?Math\\.random\\(\\)\\s?\\*\\s?\\(\\s?3\\s?\\-\\s?1\\s?\\+\\s?1\\s?\\)\\s?\\)\\s?\\+\\s?1;/gi) !== null){return editor.match(/Math\\.floor\\(\\s?Math\\.random\\(\\)\\s?\\*\\s?\\(\\s?3\\s?\\-\\s?1\\s?\\+\\s?1\\s?\\)\\s?\\)\\s?\\+\\s?1;/gi).length >= 3;}else{return false;}})(), 'You should have used <code>Math.floor(Math.random() * (3 - 1 + 1)) + 1;</code> three times to generate your random numbers.')"
+      "tests": [
+        "assert(typeof(runSlots($(\".slot\"))[0]) === \"number\" && runSlots($(\".slot\"))[0] > 0 && runSlots($(\".slot\"))[0] < 4, '<code>slotOne</code> should be a random number.')",
+        "assert(typeof(runSlots($(\".slot\"))[1]) === \"number\" && runSlots($(\".slot\"))[1] > 0 && runSlots($(\".slot\"))[1] < 4, '<code>slotTwo</code> should be a random number.')",
+        "assert(typeof(runSlots($(\".slot\"))[2]) === \"number\" && runSlots($(\".slot\"))[2] > 0 && runSlots($(\".slot\"))[2] < 4, '<code>slotThree</code> should be a random number.')",
+        "assert((function(){if(editor.match(/Math\\.floor\\(\\s?Math\\.random\\(\\)\\s?\\*\\s?\\(\\s?3\\s?\\-\\s?1\\s?\\+\\s?1\\s?\\)\\s?\\)\\s?\\+\\s?1/gi) !== null){return editor.match(/slot.*?=.*?\\(.*?\\).*?/gi).length >= 3;}else{return false;}})(), 'You should have used <code>Math.floor(Math.random() * (3 - 1 + 1)) + 1;</code> three times to generate your random numbers.')"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "fccss",
         "  function runSlots(){",
         "    var slotOne;",
@@ -1272,10 +1451,9 @@
       "challengeType": 0
     },
     {
-      "id":"cf1111c1c13feddfaeb1bdef",
+      "id": "cf1111c1c13feddfaeb1bdef",
       "title": "Add your JavaScript Slot Machine Slots",
-      "difficulty":"9.989",
-      "description":[
+      "description": [
         "Now that our slots will each generate random numbers, we need to check whether they've all returned the same number.",
         "If they have, we should notify our user that they've won.",
         "Otherwise, we should return <code>null</code>, which is a JavaScript data structure that means nothing.",
@@ -1285,10 +1463,10 @@
         "<code>&thinsp;&thinsp;return null;</code>",
         "<code>}</code>"
       ],
-      "tests":[
-        "assert((function(){var data = runSlots();if(data === null){return true}else{if(data[0] === data[1] && data[1] === data[2]){return true;}else{return false;}}})(), 'If all three of our random numbers are the same we should return that number. Otherwise we should return <code>null</code>.')"
+      "tests": [
+        "assert((function(){var data = runSlots();return data === null || data.toString().length === 1;})(), 'If all three of our random numbers are the same we should return that number. Otherwise we should return <code>null</code>.')"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "fccss",
         "  function runSlots(){",
         "    var slotOne;",
@@ -1432,10 +1610,9 @@
       "challengeType": 0
     },
     {
-      "id":"cf1111c1c13feddfaeb2bdef",
+      "id": "cf1111c1c13feddfaeb2bdef",
       "title": "Bring your JavaScript Slot Machine to Life",
-      "difficulty":"9.990",
-      "description":[
+      "description": [
         "Now we can detect a win. Let's get this slot machine working.",
         "Let's use the jQuery <code>selector</code> <code>$(\".slot\")</code> to select all of the slots.",
         "Once they are all selected, we can use <code>bracket notation</code> to access each individual slot:",
@@ -1443,11 +1620,11 @@
         "This jQuery will select the first and update the slot's HTML to display the correct number.",
         "Use the above selector to display each number in its corresponding slot."
       ],
-      "tests":[
+      "tests": [
         "assert((function(){runSlots();if($($(\".slot\")[0]).html().replace(/\\s/gi, \"\") !== \"\" && $($(\".slot\")[1]).html().replace(/\\s/gi, \"\") !== \"\" && $($(\".slot\")[2]).html().replace(/\\s/gi, \"\") !== \"\"){return true;}else{return false;}})(), 'You should be displaying the result of the slot numbers in the corresponding slots.')",
         "assert((editor.match( /\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[\\d\\]\\s*?\\)/gi) && editor.match( /\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[\\d\\]\\s*?\\)/gi ).length >= 3 && editor.match( /\\.html\\(slotOne\\)/gi ) && editor.match( /\\.html\\(slotTwo\\)/gi ) && editor.match( /\\.html\\(slotThree\\)/gi )), 'You should have used the the selector given in the description to select each slot and assign it the value of <code>slotOne</code>&#44; <code>slotTwo</code> and <code>slotThree</code> respectively.')"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "fccss",
         "  function runSlots(){",
         "    var slotOne;",
@@ -1469,8 +1646,8 @@
         "    ",
         "    // Only change code above this line.",
         "    ",
-        "    if(slotOne !== slotTwo || slotTwo !== slotThree){",
-        "      return null;",
+        "    if (slotOne === slotTwo && slotTwo === slotThree) {",
+        "      return slotOne;",
         "    }",
         "    ",
         "    if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){",
@@ -1598,17 +1775,16 @@
       "challengeType": 0
     },
     {
-      "id":"cf1111c1c11feddfaeb1bdff",
+      "id": "cf1111c1c11feddfaeb1bdff",
       "title": "Give your JavaScript Slot Machine some Stylish Images",
-      "difficulty":"9.9901",
-      "description":[
+      "description": [
         "Now let's add some images to our slots.",
         "We've already set up the images for you in an array called <code>images</code>. We can use different indexes to grab each of these.",
         "Here's how we would set the first slot to show a different image depending on which number its random number generates:",
         "<code>$($('.slot')[0]).html('&lt;img src = \"' + images[slotOne-1] + '\"&gt;');</code>",
         "Set up all three slots like this, then click the \"Go\" button to play the slot machine."
       ],
-      "tests":[
+      "tests": [
         "assert((editor.match(/\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[\\d\\]\\s*?\\)\\.html\\(\\s*?\\'\\<img\\s?src\\s?=\\s?\"\\'\\s?\\+\\s?images\\[\\w+\\-1\\]\\s?\\+\\s?\\'\"\\>\\'\\s*?\\);/gi) && editor.match(/\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[\\d\\]\\s*?\\)\\.html\\(\\s*?\\'\\<img\\s?src\\s?=\\s?\"\\'\\s?\\+\\s?images\\[\\w+\\-1\\]\\s?\\+\\s?\\'\"\\>\\'\\s*?\\);/gi).length >= 3), 'Use the provided code three times. One for each slot.')",
         "assert(editor.match(/\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[0\\]\\s*?\\)/gi), 'You should have used <code>$&#40;&#39;.slot&#39;&#41;[0]</code> at least once.')",
         "assert(editor.match(/\\$\\s*?\\(\\s*?\\$\\s*?\\(\\s*?(?:'|\")\\s*?\\.slot\\s*?(?:'|\")\\s*?\\)\\[1\\]\\s*?\\)/gi), 'You should have used <code>$&#40;&#39;.slot&#39;&#41;[1]</code> at least once.')",
@@ -1617,7 +1793,7 @@
         "assert(editor.match(/slotTwo/gi) && editor.match(/slotTwo/gi).length >= 8, 'You should have used the <code>slotTwo</code> value at least once.')",
         "assert(editor.match(/slotThree/gi) && editor.match(/slotThree/gi).length >= 7, 'You should have used the <code>slotThree</code> value at least once.')"
       ],
-      "challengeSeed":[
+      "challengeSeed": [
         "fccss",
         "  function runSlots(){",
         "    var slotOne;",
@@ -1639,8 +1815,8 @@
         "    ",
         "    // Only change code above this line.",
         "    ",
-        "    if(slotOne !== slotTwo || slotTwo !== slotThree){",
-        "      return null;",
+        "    if (slotOne === slotTwo && slotTwo === slotThree) {",
+        "      return slotOne;",
         "    }",
         "    ",
         "    if(slotOne !== undefined && slotTwo !== undefined && slotThree !== undefined){",
diff --git a/seed/challenges/basic-ziplines.json b/seed/challenges/basic-ziplines.json
index 4565f364a8..0cd948d614 100644
--- a/seed/challenges/basic-ziplines.json
+++ b/seed/challenges/basic-ziplines.json
@@ -35,7 +35,7 @@
         [
           "http://i.imgur.com/Wzt6Y9Y.gif",
           "A gif showing the process of saving and forking a pen.",
-          "Save your pen with the \"Save\" button. Then click the \"Fork\" button. This will create a fork (copy) of your pen that you can experimient with.",
+          "Save your pen with the \"Save\" button. Then click the \"Fork\" button. This will create a fork (copy) of your pen that you can experiment with.",
           ""
         ]
       ],
@@ -68,7 +68,7 @@
         "<span class='text-info'>User Story:</span> As a user, I can click different buttons that will take me to the portfolio creator's different social media pages.",
         "<span class='text-info'>User Story:</span> As a user, I can see thumbnail images of different projects the portfolio creator has built (if you haven't built any websites before, use placeholders.)",
         "<span class='text-info'>Bonus User Story:</span> As a user, I navigate to different sections of the webpage by clicking buttons in the navigation.",
-        "Don't worry if you don't have anything to showcase on your portfolio yet - you will build several several apps on the next few CodePen challenges, and can come back and update your portfolio later.",
+        "Don't worry if you don't have anything to showcase on your portfolio yet - you will build several apps on the next few CodePen challenges, and can come back and update your portfolio later.",
         "There are many great portfolio templates out there, but for this challenge, you'll need to build a portfolio page yourself. Using Bootstrap will make this much easier for you.",
         "Note that CodePen.io overrides the Window.open() function, so if you want to open windows using jquery, you will need to target invisible anchor elements like this one: <code>&lt;a target='_blank'&gt;</a></code>.",
         "Remember to use <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck' target='_blank'>Read-Search-Ask</a> if you get stuck.",
diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json
index b97d45b04c..4306f0b5f7 100644
--- a/seed/challenges/bootstrap.json
+++ b/seed/challenges/bootstrap.json
@@ -10,12 +10,15 @@
         "Now let's go back to our Cat Photo App. This time, we'll style it using the popular Bootstrap responsive CSS framework.",
         "Bootstrap will figure out how wide your screen is and respond by resizing your HTML elements - hence the name <code>Responsive Design</code>.",
         "With responsive design, there is no need to design a mobile version of your website. It will look good on devices with screens of any width.",
-        "You can add Bootstrap to any app just by including it with <code>&#60;link rel=\"stylesheet\" href=\"//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css\"/&#62;</code> at the top of your HTML. But we've added it for you to this page behind the scenes.",
+        "You can add Bootstrap to any app just by including it by adding the following code to the top of your HTML:",
+        "<code>&#60;link rel=\"stylesheet\" href=\"//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css\"/&#62;</code>",
+        "In this case, we've already added it for you to this page behind the scenes.",
         "To get started, we should nest all of our HTML in a <code>div</code> element with the class <code>container-fluid</code>."
       ],
       "tests": [
-        "assert($(\"div\").hasClass(\"container-fluid\"), 'Your <code>div</code> element should have the class <code>container-fluid</code>')",
-        "assert(editor.match(/<\\/div>/g) && editor.match(/<div/g) && editor.match(/<\\/div>/g).length === editor.match(/<div/g).length, 'Make sure each of your <code>div</code> elements has a closing tag.')"
+        "assert($(\"div\").hasClass(\"container-fluid\"), 'Your <code>div</code> element should have the class <code>container-fluid</code>.')",
+        "assert(editor.match(/<\\/div>/g) && editor.match(/<div/g) && editor.match(/<\\/div>/g).length === editor.match(/<div/g).length, 'Make sure each of your <code>div</code> elements has a closing tag.')",
+        "assert($(\".container-fluid\").children().length >= 8, 'Make sure you have nested all HTML elements in <code>.container-fluid</code>.')"
       ],
       "challengeSeed": [
         "<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">",
@@ -90,14 +93,15 @@
       "id": "bad87fee1348bd9acde08812",
       "title": "Make Images Mobile Responsive",
       "description": [
-        "First, add a new image below the existing one. Set it's <code>src</code> attribute to <code>http://bit.ly/fcc-running-cats</code>.",
+        "First, add a new image below the existing one. Set its <code>src</code> attribute to <code>http://bit.ly/fcc-running-cats</code>.",
         "It would be great if this image could be exactly the width of our phone's screen.",
         "Fortunately, with Bootstrap, all we need to do is add the <code>img-responsive</code> class to your image. Do this, and the image should perfectly fit the width of your page."
       ],
       "tests": [
-        "assert($(\"img\").length > 1, 'You should have a total of two images.')",
-        "assert($(\"img\").hasClass(\"img-responsive\"), 'Your new image should have the class <code>img-responsive</code>.')",
-        "assert(new RegExp(\"http://bit.ly/fcc-running-cats\", \"gi\").test($(\"img.img-responsive\").attr(\"src\")), 'Add a second image with the <code>src</code> of <code>http&#58;//bit.ly/fcc-running-cats</code>.')"
+        "assert($(\"img\").length === 2, 'You should have a total of two images.')",
+        "assert($(\"img:eq(1)\").hasClass(\"img-responsive\"), 'Your new image should be below your old one and have the class <code>img-responsive</code>.')",
+        "assert($(\"img:eq(1)\").attr(\"src\") === \"http://bit.ly/fcc-running-cats\", 'Your new image should have a <code>src</code> of <code>http&#58;//bit.ly/fcc-running-cats</code>.')",
+        "assert(editor.match(/<img/g) && editor.match(/<img.*>/g).length === 2 && editor.match(/<img/g).length === 2, 'Make sure your new <code>img</code> element has a closing angle bracket.')"
       ],
       "challengeSeed": [
         "<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">",
@@ -175,7 +179,8 @@
       "title": "Center Text with Bootstrap",
       "description": [
         "Now that we're using Bootstrap, we can center our heading element to make it look better. All we need to do is add the class <code>text-center</code> to our <code>h2</code> element.",
-        "Remember that you can add several classes to the same element by separating each of them with a space, like this: <code>&#60h2 class=\"red-text text-center\"&#62your text&#60/h2&#62</code>."
+        "Remember that you can add several classes to the same element by separating each of them with a space, like this:",
+        "<code>&#60h2 class=\"red-text text-center\"&#62your text&#60/h2&#62</code>"
       ],
       "tests": [
         "assert($(\"h2\").hasClass(\"text-center\"), 'Your <code>h2</code> element should be centered by applying the class <code>text-center</code>')"
@@ -341,7 +346,7 @@
       "id": "bad87fee1348cd8acef08812",
       "title": "Create a Block Element Bootstrap Button",
       "description": [
-        "Normally, your <code>button</code> elements are only as wide as the text that they contain. By making them block elements, your button will stretch to fill your page's entire horizontal space.",
+        "Normally, your <code>button</code> elements are only as wide as the text that they contain. By making them block elements, your button will stretch to fill your page's entire horizontal space and any elements following it will flow onto a \"new line\" below the block.",
         "This image illustrates the difference between <code>inline</code> elements and <code>block-level</code> elements:",
         "<a href=\"http://i.imgur.com/O32cDWE.png\" data-lightbox=\"img-enlarge\"><img class=\"img-responsive\" src=\"http://i.imgur.com/O32cDWE.png\" title=\"Click to enlarge\" alt=\"An \"inline\" button is as small as the text it contains. In this image, it's centered. Below it is a \"block-level\" button, which stretches to fill the entire horizontal space.'></a>",
         "Note that these buttons still need the <code>btn</code> class.",
@@ -888,7 +893,8 @@
         "<a href=\"http://i.imgur.com/O32cDWE.png\" data-lightbox=\"img-enlarge\"><img class=\"img-responsive\" src=\"http://i.imgur.com/O32cDWE.png\" title=\"Click to enlarge\" alt=\"An \"inline\" button is as small as the text it contains. In this image, it's centered. Below it is a \"block-level\" button, which stretches to fill the entire horizontal space.'></a>",
         "By using the <code>span</code> element, you can put several elements together, and even style different parts of the same element differently.",
         "Nest the word \"love\" in your \"Things cats love\" element below within a <code>span</code> element. Then give that <code>span</code> the class <code>text-danger</code> to make the text red.",
-        "Here's how you would do this with the \"Top 3 things cats hate\" element: <code>&#60;p&#62;Top 3 things cats &#60;span class = \"text-danger\"&#62;hate&#60;/span&#62;&#60;/p&#62;</code>"
+        "Here's how you would do this with the \"Top 3 things cats hate\" element:",
+        "<code>&#60;p&#62;Top 3 things cats &#60;span class = \"text-danger\"&#62;hate&#60;/span&#62;&#60;/p&#62;</code>"
       ],
       "tests": [
         "assert($(\"p span\") && $(\"p span\").length > 0, 'Your <code>span</code> element should be inside your <code>p</code> element.')",
@@ -1904,9 +1910,10 @@
       "title": "Add ID Attributes to Bootstrap Elements",
       "description": [
         "Recall that in addition to class attributes, you can give each of your elements an <code>id</code> attribute.",
-        "Each id should be unique to a specific element.",
+        "Each id must be unique to a specific element and used only once per page.",
         "Let's give a unique id to each of our <code>div</code> elements of class <code>well</code>.",
-        "Remember that you can give an element an id like this: <code>&#60;div class=\"well\" id=\"center-well\"&#62;</code>",
+        "Remember that you can give an element an id like this:",
+         "<code>&#60;div class=\"well\" id=\"center-well\"&#62;</code>",
         "Give the well on the left the id of <code>left-well</code>. Give the well on the right the <code>id</code> of <code>right-well</code>."
       ],
       "tests": [
@@ -2106,11 +2113,11 @@
         "When we start using jQuery, we will modify HTML elements without needing to actually change them in HTML.",
         "Let's make sure that everyone knows they shouldn't actually modify any of this code directly.",
         "Remember that you can start a comment with <code>&#60;!--</code> and end a comment with <code>--&#62;</code>",
-        "Add a comment at the top of your HTML that says <code>You shouldn't need to modify code below this line</code>."
+        "Add a comment at the top of your HTML that says <code>Only change code above this line.</code>"
       ],
       "tests": [
         "assert(editor.match(/<!--/g) && editor.match(/<!--/g).length > 0, 'Start a comment with <code>&#60;!--</code>.')",
-        "assert(editor.match(/this line/g) && editor.match(/this line/g).length > 0, 'Your comment should have the text <code>You shouldn&#39;t need to modify code below this line</code>.')",
+        "assert(editor.match(/this line/g) && editor.match(/this line/g).length > 0, 'Your comment should have the text <code>Only change code above this line</code>.')",
         "assert(editor.match(/-->.*\\n+.+/g), 'Be sure to close your comment with <code>--&#62;</code>.')"
       ],
       "challengeSeed": [
diff --git a/seed/challenges/gear-up-for-success.json b/seed/challenges/gear-up-for-success.json
index 7a6fd0a670..826db9bb3f 100644
--- a/seed/challenges/gear-up-for-success.json
+++ b/seed/challenges/gear-up-for-success.json
@@ -11,7 +11,7 @@
         [
           "http://i.imgur.com/YNwsMXM.gif",
           "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.",
-          "Click the \"News\" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy.",
+          "Click the \"News\" button in your upper right hand corner. <br>You can browse links on Camper News and upvote the ones that you enjoy.",
           ""
         ]
       ],
@@ -37,7 +37,7 @@
         [
           "http://i.imgur.com/4GO4zcI.gif",
           "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
-          "Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.",
+          "Click the \"Wiki\" button in your upper right hand corner. <br>Our community has contributed lots of useful information to this searchable wiki.",
           ""
         ]
       ],
@@ -63,7 +63,7 @@
         [
           "http://i.imgur.com/vJyiXzU.gif",
           "A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.",
-          "You can add Free Code Camp to your LinkedIn education background. Set your graduation date as next year. For \"Degree\", type \"Full Stack Web Development Certification\". For \"Field of study\", type \"Computer Software Engineering\". Then click \"Save Changes\".",
+          "LinkedIn recognizes Free Code Camp as a university. You can gain access to our large alumni network by adding Free Code Camp to your LinkedIn profile's education section. <br>Set your graduation date as next year. <br>For \"Degree\", type \"Full Stack Web Development Certification\". <br>For \"Field of study\", type \"Computer Software Engineering\". <br>Then click \"Save Changes\".",
           "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
         ]
       ],
@@ -89,7 +89,7 @@
         [
           "http://i.imgur.com/Og1ifsn.gif",
           "A gif showing how you can commit to a goal for your Free Code Camp studies and pledge a monthly donation to a nonprofit to give you external motivation to reach that goal.",
-          "You can set a goal and pledge to donate to a nonprofit each month until you achieve that goal. give you external motivation in your quest to learn to code, as well as the opportunity to help nonprofits right away. Choose your goal, choose a monthly donation. When you click \"commit\", the nonprofit's donate page will open in a new tab. You can change your commitment or stop it at any time.",
+          "You can set a goal and pledge to donate to a nonprofit each month until you achieve that goal. <br>This will give you external motivation in your quest to learn to code, as well as an opportunity to help nonprofits right away. <br>Choose your goal, then choose a monthly donation. When you click \"commit\", the nonprofit's donation page will open in a new tab. <br>This is completely optional, and you can change your commitment or stop it at any time.",
           "/commit"
         ]
       ],
diff --git a/seed/challenges/getting-started.json b/seed/challenges/getting-started.json
index 3513468561..3a0d244209 100644
--- a/seed/challenges/getting-started.json
+++ b/seed/challenges/getting-started.json
@@ -15,27 +15,39 @@
           ""
         ],
         [
-          "http://i.imgur.com/pYsTbjI.jpg",
-          "A screenshot of our curriculum alongside a screenshot of our chat room.",
-          "Learning to code is hard. To succeed, you'll need lots of practice and support. That's why we've created a rigorous curriculum and supportive community.",
+          "http://i.imgur.com/Elb3dfj.jpg",
+          "A screenshot of some of our campers coding together in Toronto.",
+          "<bold>Learning to code is hard.</bold> To succeed, you'll need lots of practice and support. That's why we've created a rigorous curriculum and supportive community.",
           ""
         ],
         [
           "http://i.imgur.com/D7Y5luw.jpg",
           "A graph of the rate of job growth against growth in computer science degree graduates. There are 1.4 million jobs and only 400 million people to fill them.",
-          "There are thousands of coding jobs currently going unfilled, and the demand for coders grows every year. If you want a coding job, we can help prepare you to get one.",
+          "There are thousands of coding jobs currently going unfilled, and the demand for coders grows every year.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/WD3STY6.jpg",
+          "Photos of three campers who've gotten jobs after learning to code at Free Code Camp.",
+          "Free Code Camp is a proven path to your first coding job. In fact, no one has actually completed our entire program, because campers get jobs before they're able to.",
           ""
         ],
         [
           "http://i.imgur.com/dLx8nrg.jpg",
           "An illustration showing that you will learn HTML5, CSS3, JavaScript, Databases, Git, Node.js, Angular.js and Agile.",
-          "First you'll work through our rigorous 800-hour curriculum learn technologies like HTML5, Node.js and databases. It's self-paced and 100% free.",
+          "During the first half of Free Code Camp, you'll learn technologies like HTML5, Node.js and databases.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/syJxavV.jpg",
+          "A screenshot of our Front End Development Certificate",
+          "About 400 hours into Free Code Camp, you'll earn your verified Front End Development Certification.",
           ""
         ],
         [
           "http://i.imgur.com/sKYQhdG.jpg",
-          "A screenshot of our Front End Development Certificate",
-          "About half way through our curriculum, you'll earn a verified Front End Development Certificate. If you can finish our entire curriculum, you'll earn a verified Full Stack Development Certificate.",
+          "A screenshot of our Full Stack Development Certificate",
+          "About 800 hours into Free Code Camp, you'll earn your verified Full Stack Development Certification.",
           ""
         ],
         [
@@ -79,7 +91,7 @@
         [
           "http://i.imgur.com/ALN6zPK.gif",
           "A gif showing you how to click the profile image in the upper right hand corner of GitHub. Upload a photo of yourself or you will continue to use the automatically generated pixel art. Then fill in the remaining form fields and click submit.",
-          "Click the pixel art in the upper right hand corner of GitHub, then choose settings. Upload a picture of yourself. A picture of your face works best. This is how your fellow campers will see you in our chat rooms, so put your best foot forward. You can add your city and your name if you want.",
+          "Click the pixel art in the upper right hand corner of GitHub, then choose settings. <br>Upload a picture of yourself. A picture of your face works best. This is how your fellow campers will see you in our chat rooms, so put your best foot forward. <br>You can add your city and your name if you want.",
           "https://github.com/settings/profile"
         ],
         [
@@ -91,7 +103,7 @@
         [
           "http://i.imgur.com/zwYPeQT.gif",
           "A gif showing you how to click the link below to go to our chat room and click the \"sign in with GitHub\" button. Then you can click into the text input field and type a message to your fellow campers.",
-          "Now that you have a GitHub account, you can join our main chat room by logging in with GitHub. Introduce yourself by saying \"Hello world!\". Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.",
+          "Now that you have a GitHub account, you can join our main chat room by logging in with GitHub. Introduce yourself by saying \"Hello world!\". <br>Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.",
           "https://gitter.im/FreeCodeCamp/FreeCodeCamp"
         ],
         [
@@ -141,7 +153,7 @@
         [
           "http://i.imgur.com/tP2ccTE.gif",
           "A gif showing how you can click your profile image in your upper right hand corner to your code portfolio and connect GitHub.",
-          "Check out your code portfolio. Click your picture in your upper right hand corner. To activate your code portfolio, you'll need to link your GitHub account with Free Code Camp. Your code portfolio shows your progress and how many Brownie Points you have. You can get Brownie Points by completing challenges and by helping other campers in our chat rooms. If you get Brownie Points on several days in a row, you'll get a streak.",
+          "Check out your code portfolio. Click your picture in your upper right hand corner. To activate your code portfolio, you'll need to link your GitHub account with Free Code Camp. <br>Your code portfolio shows your progress and how many Brownie Points you have. You can get Brownie Points by completing challenges and by helping other campers in our chat rooms. If you get Brownie Points on several days in a row, you'll get a streak.",
           ""
         ]
       ],
@@ -165,7 +177,7 @@
       "challengeSeed": [],
       "description": [
         [
-          "http://i.imgur.com/Elb3dfj.jpg",
+          "http://i.imgur.com/NAOFJWN.jpg",
           "A picture of some of our campers meeting in a local cafe. 3 men and 3 women are sitting around a table with laptops out, and are smiling and coding.",
           "Our Campsites help you code with campers in your city. You can coordinate study groups or attend local coding events together.",
           ""
@@ -173,7 +185,7 @@
         [
           "http://i.imgur.com/fTFMjwf.gif",
           "A gif showing how you can click the link below, find your city on the list of Campsites, then click on the Facebook link for your city and join your city's Facebook group.",
-          "Find your city on this list and click it. This will take you to your city's Campsite's Facebook group. Click the \"Join group\" button to apply to join your city's Facebook group. Someone from the campsite should approve you shortly. If your city isn't on this list, scroll to the bottom of the wiki article for instructions for how you can create your city's Campsite.",
+          "Find your city on this list and click it. This will take you to your city's Campsite's Facebook group. <br>Click the \"Join group\" button to apply to join your city's Facebook group. Someone from the campsite should approve you shortly. <br>If your city isn't on this list, scroll to the bottom of the wiki article for instructions for how you can create your city's Campsite.",
           "https://github.com/FreeCodeCamp/freecodecamp/wiki/List-of-Free-Code-Camp-city-based-Campsites"
         ]
       ],
@@ -196,10 +208,28 @@
       "title": "Learn What to Do If You Get Stuck",
       "challengeSeed": [],
       "description": [
+        [
+          "http://i.imgur.com/lzKvwU2.jpg",
+          "The text \"Coding is hard.\"",
+          "Coding is hard. You will get stuck. Even experienced coders get stuck. The key is knowing how to get unstuck.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/sfsidp6.jpg",
+          "The text \"It takes time to get good at coding.\"",
+          "It takes time to get good at coding. You wouldn't expect to beat a chess master after playing for 3 months. Don't expect to build the next Facebook after coding for 3 months.",
+          ""
+        ],
+        [
+          "http://i.imgur.com/EoTfOyC.jpg",
+          "An image of some of our campers coding together in Montreal.",
+          "Keep practicing coding every day and hanging out with other people who code, and you will becoming a job-ready coder.",
+          ""
+        ],
         [
           "http://i.imgur.com/EWWZBag.jpg",
           "An image with the text \"1. Read the error 2. Search Google 3. Ask for help.",
-          "Let's cover one last thing before you start working through our challenges: how to get help. Any time you get stuck or don't know what to do next: Read-Search-Ask.",
+          "Any time you get stuck or don't know what to do next: Read-Search-Ask.",
           ""
         ],
         [
@@ -223,7 +253,7 @@
         [
           "http://i.imgur.com/ZRgXraT.gif",
           "A gif showing us scrolling through our challenge map.",
-          "Now you're ready to start coding! The \"Map\" button in your upper right hand corner will show you our challenge map. This map shows all our coding challenges. We recommend that you complete these from top to bottom, at a sustainable pace. You can also return to your next challenge by clicking the \"Learn\" button.",
+          "Now you're ready to start coding. <br>The \"Map\" button in your upper right hand corner will show you our challenge map. <br>We recommend that you complete these from top to bottom, at a sustainable pace. <br>Our open source community is constantly improving our challenges, so don't be surprised if they change or move around. Don't worry about going back - just keep moving forward. <br>You can always go to your most recent challenge by clicking the \"Learn\" button.",
           ""
         ]
       ],
diff --git a/seed/challenges/html5-and-css.json b/seed/challenges/html5-and-css.json
index c54d12541a..4372a5cf6b 100644
--- a/seed/challenges/html5-and-css.json
+++ b/seed/challenges/html5-and-css.json
@@ -7,12 +7,17 @@
       "id": "bd7123c8c441eddfaeb5bdef",
       "title": "Say Hello to HTML Elements",
       "description": [
-        "Welcome to Free Code Camp's first coding challenge!",
+        "Welcome to Free Code Camp's first coding challenge.",
         "You can edit <code>code</code> in your <code>text editor</code>, which we've embedded into this web page.",
         "Do you see the code in your text editor that says <code>&#60;h1&#62;Hello&#60;/h1&#62;</code>? That's an HTML <code>element</code>.",
-        "Most HTML elements have an <code>opening tag</code> and a <code>closing tag</code>. Opening tags look like this: <code>&#60;h1&#62;</code>. Closing tags look like this: <code>&#60;/h1&#62;</code>. Note that the only difference between opening tags and closing tags is that closing tags have a slash after their opening angle bracket.",
-        "Once you've completed each challenge, and all its tests are passing, the \"Go to my next challenge\" button will become enabled. Click it - or press control and enter at the same time - to advance to the next challenge.",
-        "To enable the \"Go to my next challenge\" button on this exercise, change your <code>h1</code> tag's text to say \"Hello World\" instead of \"Hello\"."
+        "Most HTML elements have an <code>opening tag</code> and a <code>closing tag</code>.",
+        "Opening tags look like this:",
+        "<code>&#60;h1&#62;</code>",
+        "Closing tags look like this:",
+        "<code>&#60;/h1&#62;</code>",
+        "Note that the only difference between opening tags and closing tags is that closing tags have a slash after their opening angle bracket.",
+        "Each challenge has tests that you can run at any time by clicking the \"Run tests\" button. Once you get all tests passing, you can advance to the next challenge.",
+        "To pass the test on this challenge, change your <code>h1</code> element's text to say \"Hello World\" instead of \"Hello\". Then click the \"Run tests\" button."
       ],
       "tests": [
         "assert.isTrue((/hello(\\s)+world/gi).test($('h1').text()), 'Your <code>h1</code> element should have the text \"Hello World\".')"
@@ -45,7 +50,7 @@
         "Willkommen bei der ersten Programmier-Challenge von Free Code Camp! Klicke auf den folgenden Button für weitere Instruktionen.",
         "Sehr gut. Jetzt kannst du den Rest der Instruktionen für diese Challenge lesen.",
         "Mithilfe des eingebauten <code>Text Editors</code> kannst du den <code>Code</code> bearbeiten.",
-        "Siehst du den Code <code>&#60;h1&#62;Hallo&#60;/h1&#62;</code> im Editor? Das ist ein HTML <code>Element</code>.",
+        "Siehst du den Code <code>&#60;h1&#62;Hallo&#60;/h1&#62;</code> im Editor? Das ist ein HTML <code>Element</code>",
         "Die meisten HTML Elemente haben eine <code>öffnende Auszeichnung (Tag)</code> und eine <code>sich schließende</code>. Öffnende Tags sehen so aus: <code>&#60;h1&#62;</code>. Schließende Tags so: <code>&#60;/h1&#62;</code>. Beachte, dass der einzige Unterschied zwischen öffnenden und schließenden Tags in dem Slash besteht, das bei schließenden Tags auf die sich öffnende spitze Klammer folgt.",
         "Sobald du eine Challenge abgeschlossen hast und alle Tests erfolgreich sind, wird der Button \"Go to my next challenge\" aktiv. Klicke auf diesen – oder drücke Steuerung (Control) und gleichzeitig Enter – um zur nächsten Challenge zu gehen.",
         "Um den Button \"Go to my next challenge\" dieser Lektion zu aktivieren, ändere den Inhalt des <code>h1</code> Tags von \"Hello\" zu \"Hello World\"."
@@ -57,10 +62,10 @@
       "description": [
         "Over the next few challenges, we'll build an HTML5 app that will look something like this:",
         "<a href=\"http://i.imgur.com/jOc1JF1.png\" data-lightbox=\"img-enlarge\"><img class=\"img-responsive\" src=\"http://i.imgur.com/jOc1JF1.png\" title=\"Click to enlarge\" alt=\"A screen shot of our finished Cat Photo App\"></a>",
-        "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.",
         "The <code>h2</code> element you enter will create an <code>h2</code> element on the website.",
         "This element tells the browser how to render the text that it contains.",
-        "<code>h2</code> elements are slightly smaller than <code>h1</code> elements. There are also <code>h3</code>, <code>h4</code>, <code>h5</code> and <code>h6</code> elements."
+        "<code>h2</code> elements are slightly smaller than <code>h1</code> elements. There are also <code>h3</code>, <code>h4</code>, <code>h5</code> and <code>h6</code> elements.",
+        "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."
       ],
       "tests": [
         "assert(($(\"h2\").length > 0), 'Create an <code>h2</code> element.')",
@@ -84,7 +89,7 @@
         "Agrega una etiqueta <code>h2</code> que diga \"CatPhotoApp\" para crear un segundo <code>elemento</code> HTML debajo de tu elemento <code>h1</code> \"Hello World\".",
         "El elemento h2 que ingreses creará un elemento h2 en el sitio web.",
         "Este elemento le dice al navegador cómo mostrar el texto que contiene.",
-        "Los elementos <code>h2</code> son ligeramente más pequeños que los elementos <code>h1</code>. También hay elementos <code>h3</code>, <code>h4</code>, <code>h5</code> y <code>h6</code>."
+        "Los elementos <code>h2</code> son ligeramente más pequeños que los elementos <code>h1</code>. También hay elementos <code>h3</code>, <code>h4</code>, <code>h5</code> y <code>h6</code>"
       ],
       "namePt": "",
       "descriptionPt": [],
@@ -100,9 +105,10 @@
       "id": "bad87fee1348bd9aedf08801",
       "title": "Inform with the Paragraph Element",
       "description": [
-        "Create a <code>p</code> element below your <code>h2</code> element, and give it the text \"Hello Paragraph\".",
         "<code>p</code> elements are the preferred element for normal-sized paragraph text on websites. P is short for \"paragraph\".",
-        "You can create a <code>p</code> element like so: <code>&#60;p&#62;I'm a p tag!&#60;/p&#62;</code>."
+        "You can create a <code>p</code> element like this:",
+        "<code>&#60;p&#62;I'm a p tag!&#60;/p&#62;</code>",
+        "Create a <code>p</code> element below your <code>h2</code> element, and give it the text \"Hello Paragraph\"."
       ],
       "tests": [
         "assert(($(\"p\").length > 0), 'Create a <code>p</code> element.')",
@@ -123,9 +129,9 @@
       "descriptionRu": [],
       "nameEs": "Waypoint: Informa con el Elemento Párrafo",
       "descriptionEs": [
-        "Crea un elemento párrafo debajo de tu elemento h2, y dale el texto \"Hello Paragraph\". Apenas escribas la etiqueta de apertura <code>&#60;p&#62;</code>, una de nuestras pruebas pasarán (ya que ésta es HTML válido). Asegúrate de cerrar el elemento agregando la etiqueta de cierre <code>&#60;/p&#62;</code>.",
+        "Crea un elemento párrafo debajo de tu elemento h2, y dale el texto \"Hello Paragraph\". Apenas escribas la etiqueta de apertura <code>&#60;p&#62;</code>, una de nuestras pruebas pasarán (ya que ésta es HTML válido). Asegúrate de cerrar el elemento agregando la etiqueta de cierre <code>&#60;/p&#62;</code>",
         "Los elementos párrafo son los principales elementos para los párrafos de texto en tamaño normal en sitios web.",
-        "Tú puedes crear un elemento párrafo como éste: <code>&#60;p&#62;I'm a p tag!&#60;/p&#62;</code>."
+        "Tú puedes crear un elemento párrafo como éste: <code>&#60;p&#62;I'm a p tag!&#60;/p&#62;</code>"
       ],
       "namePt": "",
       "descriptionPt": [],
@@ -140,10 +146,10 @@
       "id": "bad87fee1348bd9aedf08802",
       "title": "Uncomment HTML",
       "description": [
-        "Uncomment your <code>h1</code>, <code>h2</code> and <code>p</code> elements.",
         "Commenting is a way that you can leave comments within your code without affecting the code itself.",
         "Commenting is also a convenient way to make code inactive without having to delete it entirely.",
-        "You can start a comment with <code>&#60;!--</code> and end a comment with <code>--&#62;</code>."
+        "You can start a comment with <code>&#60;!--</code> and end a comment with <code>--&#62;</code>",
+        "Uncomment your <code>h1</code>, <code>h2</code> and <code>p</code> elements."
       ],
       "tests": [
         "assert($(\"h1\").length > 0, 'Make your <code>h1</code> element visible on your page by uncommenting it.')",
@@ -170,10 +176,10 @@
       "descriptionRu": [],
       "nameEs": "Waypoint: Quitar comentarios HTML",
       "descriptionEs": [
-        "Quitar el comentario a los elementos <code>h1</code>, <code>h2</code> y <code>p</code>.",
+        "Quitar el comentario a los elementos <code>h1</code>, <code>h2</code> y <code>p</code>",
         "Crear comentarios es una forma en la que puedes dejar mensajes dentro de tu código sin afectar el resultado.",
         "Agregar comentarios es también una forma conveniente de desactivar tu código sin tener que borrarlo por completo.",
-        "Puedes comenzar un comentario con <code>&#60;!--</code> y terminar de comentar con <code>--&#62;</code>."
+        "Puedes comenzar un comentario con <code>&#60;!--</code> y terminar de comentar con <code>--&#62;</code>"
       ],
       "namePt": "",
       "descriptionPt": [],
@@ -189,9 +195,9 @@
       "id": "bad87fee1348bd9aedf08804",
       "title": "Comment out HTML",
       "description": [
-        "Comment out your <code>h1</code> element and your <code>p</code> element, but leave your <code>h2</code> element uncommented.",
-        "Remember that in order to start a comment, you need to use <code>&#60;!--</code> and to end a comment, you need to use <code>--&#62;</code>.",
-        "Here you'll need to end the comment before your <code>h2</code> element begins."
+        "Remember that in order to start a comment, you need to use <code>&#60;!--</code> and to end a comment, you need to use <code>--&#62;</code>",
+        "Here you'll need to end the comment before your <code>h2</code> element begins.",
+        "Comment out your <code>h1</code> element and your <code>p</code> element, but leave your <code>h2</code> element uncommented."
       ],
       "tests": [
         "assert(($(\"h1\").length === 0), 'Comment out your <code>h1</code> element so that it is not visible on your page.')",
@@ -218,8 +224,8 @@
       "descriptionRu": [],
       "nameEs": "Waypoint: Comenta en HTML",
       "descriptionEs": [
-        "Comenta el elemento <code>h1</code> y el elemento <code>p</code>, pero deja sin comentar el elemento <code>h2</code>.",
-        "Recuerda que para comenzar un comentario, necesitas usar <code>&#60;!--</code> y para terminar un comentario, necesitas usar <code>--&#62;</code>.",
+        "Comenta el elemento <code>h1</code> y el elemento <code>p</code>, pero deja sin comentar el elemento <code>h2</code>",
+        "Recuerda que para comenzar un comentario, necesitas usar <code>&#60;!--</code> y para terminar un comentario, necesitas usar <code>--&#62;</code>",
         "Aquí necesitarás terminar el comentario antes que comience el elemento h2."
       ],
       "namePt": "",
@@ -235,10 +241,10 @@
       "id": "bad87fee1348bd9aedf08833",
       "title": "Fill in the Blank with Placeholder Text",
       "description": [
-        "Web developers traditionally use <code>lorem ipsum text</code> as placeholder text. It's called <code>lorem ipsum text</code> because those are the first two words of a famous passage by Cicero of Ancient Rome.",
-        "<code>lorem ipsum text</code> has been used as placeholder text by typesetters since the 16th century, and this tradition continues on the web.",
+        "Web developers traditionally use <code>lorem ipsum text</code> as placeholder text. It's called lorem ipsum text because those are the first two words of a famous passage by Cicero of Ancient Rome.",
+        "Lorem ipsum text has been used as placeholder text by typesetters since the 16th century, and this tradition continues on the web.",
         "Well, 5 centuries is long enough. Since we're building a CatPhotoApp, let's use something called <code>kitty ipsum text</code>.",
-        "Replace the text inside your <code>p</code> element with the first few words of this <code>kitty ipsum text</code>: <code>Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.</code>"
+        "Replace the text inside your <code>p</code> element with the first few words of this kitty ipsum text: <code>Kitty ipsum dolor sit amet, shed everywhere shed everywhere stretching attack your ankles chase the red dot, hairball run catnip eat the grass sniff.</code>"
       ],
       "tests": [
         "assert.isTrue((/Kitty(\\s)+ipsum(\\s)+dolor/gi).test($(\"p\").text()), 'Your <code>p</code> element should contain the first few words of the provided <code>kitty ipsum text</code>.')"
@@ -260,7 +266,7 @@
       "descriptionRu": [],
       "nameEs": "Waypoint: Llena espacios con texto de relleno",
       "descriptionEs": [
-        "Cambia el texto en el elemento <code>p</code> para usar las primeras palabras del texto <code>Kitty Ipsum</code>.",
+        "Cambia el texto en el elemento <code>p</code> para usar las primeras palabras del texto <code>Kitty Ipsum</code>",
         "Los desarrolladores web tradicionalmente usan <code>Lorem Ipsum</code> como texto de relleno. Se llama texto Lorem Ipsum porque esas son las primeras dos palabras de una cita famosa de Cicerón de la Roma Antigua.",
         "El texto Lorem Ipsum ha sido usado como texto de relleno en las imprentas desde el siglo 16, y esta tradición continúa en la web.",
         "Bueno, 5 siglos es bastante. Ya que estamos construyendo una aplicación de fotos de gatos (CatPhotoApp), ¡usemos algo llamado <a href=πhttp://kittyipsum.com/\">Kitty Ipsum</a>!",
@@ -281,9 +287,9 @@
       "id": "bad87fed1348bd9aedf08833",
       "title": "Delete HTML Elements",
       "description": [
-        "Delete your <code>h1</code> element so we can simplify our view.",
         "Our phone doesn't have much vertical space.",
-        "Let's remove the unnecessary elements so we can start building our CatPhotoApp."
+        "Let's remove the unnecessary elements so we can start building our CatPhotoApp.",
+        "Delete your <code>h1</code> element so we can simplify our view."
       ],
       "tests": [
         "assert(($(\"h1\").length == 0), 'Delete your <code>h1</code> element.')",
@@ -324,10 +330,12 @@
       "id": "bad87fee1348bd9aedf08803",
       "title": "Change the Color of Text",
       "description": [
-        "Change your <code>h2</code> element's style so that its text color is red.",
-        "We can do this by changing the \"style\" of your <code>h2</code> element.",
+        "Now let's change the color of some of our text.",
+        "We can do this by changing the <code>style</code> of your <code>h2</code> element.",
         "The style that is responsible for the color of an element's text is the \"color\" style.",
-        "Here's how you would set your <code>h2</code> element's text color to blue: <code>&#60;h2 style=\"color: blue\"&#62;CatPhotoApp&#60;/h2&#62;</code>."
+        "Here's how you would set your <code>h2</code> element's text color to blue:",
+        "<code>&#60;h2 style=\"color: blue\"&#62;CatPhotoApp&#60;/h2&#62;</code>",
+        "Change your <code>h2</code> element's style so that its text color is red."
       ],
       "tests": [
         "assert($(\"h2\").css(\"color\") === \"rgb(255, 0, 0)\", 'Your <code>h2</code> element should be red.')"
@@ -348,9 +356,9 @@
       "nameEs": "Waypoint: Cambia el color del texto",
       "descriptionEs": [
         "Cambia el estilo del elemento <code>h2</code> de manera que el color de su texto sea rojo.",
-        "Podemos hacer esto por medio de cambiar el <code>estilo</code> del elemento <code>h2</code>.",
+        "Podemos hacer esto por medio de cambiar el <code>estilo</code> del elemento <code>h2</code>",
         "El estilo responsable del color de texto de un elemento es el estilo \"color\".",
-        "Así es como podrías volver el color de texto de tu elemento <code>h2</code> en azul: <code>&#60;h2 style=\"color: blue\"&#62;CatPhotoApp&#60;/h2&#62;</code>."
+        "Así es como podrías volver el color de texto de tu elemento <code>h2</code> en azul: <code>&#60;h2 style=\"color: blue\"&#62;CatPhotoApp&#60;/h2&#62;</code>"
       ],
       "namePt": "",
       "descriptionPt": [],
@@ -358,25 +366,31 @@
       "descriptionDe": [
         "Ändere den Style des <code>h2</code> Elements, damit die Textfarbe Rot ist.",
         "Wir können das bewerkstelligen, indem wir den \"style\" des <code>h2</code> Elements ändern.",
-        "So könntest du die Textfarbe des <code>h2</code> Elements in Blau ändern: <code>&#60;h2 style=\"color: blue\"&#62;CatPhotoApp&#60;/h2&#62;</code>."
+        "So könntest du die Textfarbe des <code>h2</code> Elements in Blau ändern: <code>&#60;h2 style=\"color: blue\"&#62;CatPhotoApp&#60;/h2&#62;</code>"
       ]
     },
     {
       "id": "bad87fee1348bd9aedf08805",
       "title": "Use CSS Selectors to Style Elements",
       "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.",
         "With CSS, there are hundreds of CSS <code>properties</code> that you can use to change the way an element looks on your page.",
-        "When you entered <code>&#60;h2 style=\"color: red\"&#62;CatPhotoApp&#60;/h2&#62;</code>, you were giving that individual <code>h2</code> element an <code>inline style</code>.",
-        "That's one way to add style to an element, but a better way is by using <code>CSS</code>, which stands for <code>Cascading Style Sheets</code>.",
-        "At the top of your code, create a <code>style</code> element like this: <code>&#60;style&#62;&#60;/style&#62;</code>.",
-        "Inside that style element, you can create a <code>CSS selector</code> for all <code>h2</code> elements. For example, if you wanted all <code>h2</code> elements to be red, your style element would look like this: <code>&#60;style&#62;h2 {color: red;}&#60;/style&#62;</code>.",
-        "Note that it's important to have both opening and closing curly braces (<code>{</code> and <code>}</code>) around each element's style. You also need to make sure your element's style is between the opening and closing style tags. Finally, be sure to add the semicolon to the end of each of your element's styles."
+        "When you entered <code>&#60;h2 style=\"color: red\"&#62;CatPhotoApp&#60;/h2&#62;</code>, you were giving that individual <code>h2</code> element an <code>inline style</code>",
+        "That's one way to add style to an element, but a better way is by using <code>CSS</code>, which stands for <code>Cascading Style Sheets</code>",
+        "At the top of your code, create a <code>style</code> element like this:",
+         "<code>&#60;style&#62;</code>",
+         "<code>&#60;/style&#62;</code>",
+        "Inside that style element, you can create a <code>CSS selector</code> for all <code>h2</code> elements. For example, if you wanted all <code>h2</code> elements to be red, your style element would look like this:",
+        "<code>&#60;style&#62;</code>",
+        "&thinsp;&thinsp;<code>h2 {color: red;}</code>",
+        "<code>&#60;/style&#62;</code>",
+        "Note that it's important to have both opening and closing curly braces (<code>{</code> and <code>}</code>) around each element's style. You also need to make sure your element's style is between the opening and closing style tags. Finally, be sure to add the semicolon to the end of each of your element's styles.",
+        "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."
       ],
       "tests": [
         "assert(!$(\"h2\").attr(\"style\"), 'Remove the style attribute from your <code>h2</code> element.')",
         "assert($(\"style\") && $(\"style\").length > 1, 'Create a <code>style</code> element.')",
         "assert($(\"h2\").css(\"color\") === \"rgb(0, 0, 255)\", 'Your <code>h2</code> element should be blue.')",
+        "assert(editor.match(/h2\\s*\\{\\s*color:\\s*blue;\\s*\\}/g), 'Ensure that your stylesheet <code>h2</code> declaration is valid with a semicolon and closing brace')",
         "assert(editor.match(/<\\/style>/g) && editor.match(/<\\/style>/g).length === (editor.match(/<style((\\s)*((type|media|scoped|title|disabled)=\"[^\"]*\")?(\\s)*)*>/g) || []).length, 'Make sure all your <code>style</code> elements are valid and have a closing tag.')"
       ],
       "challengeSeed": [
@@ -396,10 +410,10 @@
       "descriptionEs": [
         "Borra el atributo <code>style</code> de tu elemento <code>h2</code> y escribe el CSS para hacer todos los elementos <code>h2</code> de color azul.",
         "Con CSS, hay cientos de <code>atributos CSS</code> que puedes usar para cambiar como un elemento se ve en una página web.",
-        "Cuando entraste <code>&#60;h2 style=\"color: red\"&#62;CatPhotoApp&#60;h2&#62;</code>, le estuviste dando a ese elemento h2 en particular un <code>estilo en línea</code>.",
+        "Cuando entraste <code>&#60;h2 style=\"color: red\"&#62;CatPhotoApp&#60;h2&#62;</code>, le estuviste dando a ese elemento h2 en particular un <code>estilo en línea</code>",
         "Esa es una forma de agregar estilo a un elemento, pero una manera mejor es usando <code>Hojas de Estilo en Cascada (Cascading Style Sheets, CSS)</code>.",
-        "Al principio de tu código, crea una <code>etiqueta style</code> como ésta: <code>&#60;style&#62;&#60;/style&#62;</code>.",
-        "Dentro de ese elemento style, puedes crear un <code>selector css</code> para todos los elementos <code>h2</code>. Por ejemplo, si querías que todos los elementos <code>h2</code> sean rojos, tu elemento style se vería así: <code>&#60;style&#62;h2 {color: red;}&#60;/style&#62;</code>.",
+        "Al principio de tu código, crea una <code>etiqueta style</code> como ésta: <code>&#60;style&#62;&#60;/style&#62;</code>",
+        "Dentro de ese elemento style, puedes crear un <code>selector css</code> para todos los elementos <code>h2</code>. Por ejemplo, si querías que todos los elementos <code>h2</code> sean rojos, tu elemento style se vería así: <code>&#60;style&#62;h2 {color: red;}&#60;/style&#62;</code>",
         "Fíjate que es importante tener <code>llaves de apertura y de cierre</code> (<code>{</code> y <code>}</code>) alrededor del estilo para cada elemento. También necesitas asegurarte que el estilo para tu elemento está entre las etiquetas style de apertura y cierre. Finalmente, asegúrate de agregar el punto y coma al final de cada uno de los estilos de tu elemento."
       ],
       "namePt": "",
@@ -419,7 +433,6 @@
       "id": "bad87fee1348bd9aecf08806",
       "title": "Use a CSS Class to Style an Element",
       "description": [
-        "Create a CSS class called <code>red-text</code> and apply it to your <code>h2</code> element.",
         "Classes are reusable styles that can be added to HTML elements.",
         "Here's an example CSS class declaration:",
         "<code>&#60;style&#62;</code>",
@@ -428,13 +441,16 @@
         "<code>&thinsp;&thinsp;}</code>",
         "<code>&#60;/style&#62;</code>",
         "You can see that we've created a CSS class called <code>blue-text</code> within the <code>&#60;style&#62;</code> tag.",
-        "You can apply a class to an HTML element like this: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;/h2&#62;</code>.",
+        "You can apply a class to an HTML element like this:",
+        "<code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;/h2&#62;</code>",
         "Note that in your CSS <code>style</code> element, classes should start with a period. In your HTML elements' class declarations, classes shouldn't start with a period.",
-        "Instead of creating a new <code>style</code> element, try removing the <code>h2</code> style declaration from your existing style element, then replace it with the class declaration for <code>.red-text</code>."
+        "Instead of creating a new <code>style</code> element, try removing the <code>h2</code> style declaration from your existing style element, then replace it with the class declaration for <code>.red-text</code>",
+        "Create a CSS class called <code>red-text</code> and apply it to your <code>h2</code> element."
       ],
       "tests": [
         "assert($(\"h2\").css(\"color\") === \"rgb(255, 0, 0)\", 'Your <code>h2</code> element should be red.')",
         "assert($(\"h2\").hasClass(\"red-text\"), 'Your <code>h2</code> element should have the class <code>red-text</code>.')",
+        "assert(editor.match(/\\.red-text\\s*\\{\\s*color:\\s*red;\\s*\\}/g), 'Your stylesheet should declare a <code>red-text</code> class and have its color set to red.')",
         "assert($(\"h2\").attr(\"style\") === undefined, 'Do not use inline style declarations like <code>style=\"color&#58; red\"</code> in your <code>h2</code> element.')"
       ],
       "challengeSeed": [
@@ -458,12 +474,12 @@
       "descriptionRu": [],
       "nameEs": "Waypoint: Utiliza una clase CSS para darle estilo a un elemento",
       "descriptionEs": [
-        "Crea una clase CSS llamada \"red-text\" y aplicala a tu elemento <code>h2</code>.",
+        "Crea una clase CSS llamada \"red-text\" y aplicala a tu elemento <code>h2</code>",
         "Las clases son estilos reutilizables que pueden ser añadidos a elementos HTML",
         "Esta es la anatomía de una clase CSS:",
         "<img class=\"img-responsive\" alt=\"a diagram of how style tags are composed, which is also described in detail on the following lines.\" src=\"https://www.evernote.com/l/AHSCzZV0l_dDLrqD8r9JsHaBWfEzdN0OpRwB/image.png\">",
-        "Puedes ver que hemos creado una clase CSS llamada \"blue-text\" dentro de la etiqueta <code>&#60;style&#62;</code>.",
-        "Puedes aplicar una clase a un elemento HTML de esta manera: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;/h2&#62;</code>.",
+        "Puedes ver que hemos creado una clase CSS llamada \"blue-text\" dentro de la etiqueta <code>&#60;style&#62;</code>",
+        "Puedes aplicar una clase a un elemento HTML de esta manera: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;/h2&#62;</code>",
         "Nota que en el elemento CSS <code>style</code>, las clases deberían comenzar con un punto. En los elementos HTML, las declaraciones de clase, NO deberían comenzar con punto. ",
         "En vez de de crear un nuevo elemento <code>style</code>, prueba remover la declaración de estilo de <code>h2</code> y reemplazarla por la declaración \"red-text\"."
       ],
@@ -476,7 +492,7 @@
         "So sieht eine CSS Klasse aus:",
         "<img class=\"img-responsive\" alt=\"Ein Beispiel, wie Styles geschrieben werden. Das wird im Detail in den folgenden Zeilen beschrieben.\" src=\"https://www.evernote.com/l/AHSCzZV0l_dDLrqD8r9JsHaBWfEzdN0OpRwB/image.png\">",
         "Du siehst, dass wir die CSS Klasse \"blue-text\" innerhalb von <code>&#60;style&#62;</code> geschrieben haben.",
-        "Du kannst eine Klasse folgendermaßen einem HTML Element beifügen: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;/h2&#62;</code>.",
+        "Du kannst eine Klasse folgendermaßen einem HTML Element beifügen: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;/h2&#62;</code>",
         "Beachte, dass Klassen in deinem CSS <code>style</code> Element mit einem Punkt beginngen sollten. In deinen Klassen-Deklarationen von HTML Elementen sollten diese nicht mit einem Punkt beginnen.",
         "Anstatt ein neues <code>style</code> Element zu erstellen, versuche die <code>h2</code> Style-Deklaration von deinem bereits bestehenden Style Element zu entfernen und sie mit der Klassen-Deklaration \".red-text\" zu ersetzen."
       ]
@@ -485,9 +501,14 @@
       "id": "bad87fee1348bd9aefe08806",
       "title": "Style Multiple Elements with a CSS Class",
       "description": [
-        "Apply the <code>red-text</code> class to your <code>h2</code> and <code>p</code> elements.",
         "Remember that you can attach classes to HTML elements by using <code>class=\"your-class-here\"</code> within the relevant element's opening tag.",
-        "Remember that CSS class selectors require a period at the beginning like this: <code>.blue-text { color: blue; }</code>, but that class declarations don't use a period, like this: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;h2&#62;</code>."
+        "Remember that CSS class selectors require a period at the beginning like this:",
+        "<code>.blue-text {</code>",
+        "<code>&thinsp;&thinsp;color: blue;</code>",
+        "<code>}</code>",
+        "But also remember that class declarations don't use a period, like this:",
+        "<code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;h2&#62;</code>",
+        "Apply the <code>red-text</code> class to your <code>h2</code> and <code>p</code> elements."
       ],
       "tests": [
         "assert($(\"h2\").css(\"color\") === \"rgb(255, 0, 0)\", 'Your <code>h2</code> element should be red.')",
@@ -516,9 +537,9 @@
       "descriptionRu": [],
       "nameEs": "Waypoint: Estila multiples elementos con una clase CSS",
       "descriptionEs": [
-        "Aplica la clase \"red-text\" a tus elementos <code>h2</code> y <code>p</code>.",
+        "Aplica la clase \"red-text\" a tus elementos <code>h2</code> y <code>p</code>",
         "Recuerda que puedes agregar clases a elementos HTML utilizando <code>class=\"your-class-here\"</code> dentro de la tag de entrada del mismo.",
-        "Recuerda que los selectores CSS requieren un punto al principio: <code>.blue-text { color: blue; }</code>, pero que las declaraciones de clase NO llevan punto: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;h2&#62;</code>."
+        "Recuerda que los selectores CSS requieren un punto al principio: <code>.blue-text { color: blue; }</code>, pero que las declaraciones de clase NO llevan punto: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;h2&#62;</code>"
       ],
       "namePt": "",
       "descriptionPt": [],
@@ -526,17 +547,20 @@
       "descriptionDe": [
         "Füge den <code>h2</code> und <code>p</code> Elementen die Klasse \"red-text\" hinzu.",
         "Du kannst Klassen zu HTML Elementen hinzufügen, indem du zum Beispiel <code>class=\"deine-klasse\"</code> innerhalb des öffnenden Tags schreibst.",
-        "Du weißt, es gehört ein Punkt vor CSS Klassen: <code>.red-text { color: blue; }</code>. Aber diese Klassen-Deklarationen brauchen keinen Punkt: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;h2&#62;</code>."
+        "Du weißt, es gehört ein Punkt vor CSS Klassen: <code>.red-text { color: blue; }</code>. Aber diese Klassen-Deklarationen brauchen keinen Punkt: <code>&#60;h2 class=\"blue-text\"&#62;CatPhotoApp&#60;h2&#62;</code>"
       ]
     },
     {
       "id": "bad87fee1348bd9aedf08806",
       "title": "Change the Font Size of an Element",
       "description": [
-        "Create a second <code>p</code> element with the following <code>kitty ipsum text</code>: <code>Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.</code>",
-        "Then, inside your <code>&#60;style&#62;</code> element, set the <code>font-size</code> of all <code>p</code> elements to 16 pixels.",
-        "Font size is controlled by the <code>font-size</code> CSS property, like this: <code>h1 { font-size: 30px; }</code>.",
-        "See if you can figure out how to give both of your <code>p</code> elements the font-size of 16 pixels (<code>16px</code>). You can do this inside the same <code>&#60;style&#62;</code> tag that we created for your <code>red-text</code> class."
+        "Font size is controlled by the <code>font-size</code> CSS property, like this:",
+         "<code>h1 {</code>",
+        "<code>&thinsp;&thinsp;font-size: 30px;</code>",
+        "}</code>",
+        "See if you can figure out how to give both of your <code>p</code> elements the font-size of 16 pixels (<code>16px</code>). You can do this inside the same <code>&#60;style&#62;</code> tag that we created for your <code>red-text</code> class.",
+        "Create a second <code>p</code> element with the following kitty ipsum text: <code>Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.</code>",
+        "Then, inside your <code>&#60;style&#62;</code> element, set the <code>font-size</code> of all <code>p</code> elements to 16 pixels."
       ],
       "tests": [
         "assert($(\"p\").length > 1, 'You need 2 <code>p</code> elements with Kitty Ipsum text.')",
@@ -566,7 +590,7 @@
       "nameEs": "Waypoint: Cambia el tamaño de fuente de un elemento.",
       "descriptionEs": [
         "Crea un segundo elemento <code>p</code>. Luego, dentro de tu elemento <code>&#60;style&#62;</code>, pon el \"font-size\" de todos los elementos <code>p</code> a 16 pixeles.",
-        "El tamaño de fuente es controlado por el atributo CSS \"font-size\", como aquí: <code>h1 { font-size: 30px; }</code>.",
+        "El tamaño de fuente es controlado por el atributo CSS \"font-size\", como aquí: <code>h1 { font-size: 30px; }</code>",
         "Primero, crea un segundo elemento <code>p</code> con el siguiente texto Kitty Ipsum: <code>Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.</code>",
         "Ve si puedes encontrar una manera de darle a ambos elementos <code>p</code> un font-size de 16 pixeles (<code>16px</code>). Puedes hacer esto dentro de la misma etiqueta <code>&#60;style&#62;</code> que creamos para la clase \"red-text\"."
       ],
@@ -575,7 +599,7 @@
       "nameDe": "Waypoint: Ändere die Schriftgröße eines Elements",
       "descriptionDe": [
         "Erstelle ein zweites <code>p</code> Element. Ändere dann innerhalb deines <code>&#60;style&#62;</code> Elements die Schriftgröße oder \"font-size\" von allen <code>p</code> Elementen auf 16 Pixel.",
-        "Schriftgröße wird von dem CSS Attribut \"font-size\" kontrolliert: <code>h1 { font-size: 30px; }</code>.",
+        "Schriftgröße wird von dem CSS Attribut \"font-size\" kontrolliert: <code>h1 { font-size: 30px; }</code>",
         "Zuerst erstellst du ein zweites <code>p</code> Element mit dem folgenden Kitty Ipsum Text: <code>Purr jump eat the grass rip the couch scratched sunbathe, shed everywhere rip the couch sleep in the sink fluffy fur catnip scratched.</code>",
         "Versuche nun beiden <code>p</code> Elementen die Schriftgröße von 16 Pixeln (<code>16px</code>) zu geben. Du kannst das innerhalb des selben <code>&#60;style&#62;</code> Tags machen, welches wir für deine \"red-text\" Klasse erstellt haben."
       ]
@@ -584,9 +608,12 @@
       "id": "bad87fee1348bd9aede08807",
       "title": "Set the Font Family of an Element",
       "description": [
-        "Make all of your <code>p</code> elements use the <code>Monospace</code> font.",
         "You can set an element's font by using the <code>font-family</code> property.",
-        "For example, if you wanted to set your <code>h2</code> element's font to <code>Sans-serif</code>, you would use the following CSS: <code>h2 { font-family: Sans-serif; }</code>."
+        "For example, if you wanted to set your <code>h2</code> element's font to <code>Sans-serif</code>, you would use the following CSS:",
+        "<code>h2 {</code>",
+        "<code>&thinsp;&thinsp;font-family: Sans-serif;</code>",
+        "<code>}</code>",
+        "Make all of your <code>p</code> elements use the <code>Monospace</code> font."
       ],
       "tests": [
         "assert($(\"p\").css(\"font-family\").match(/monospace/i), 'Your <code>p</code> elements should use the font <code>Monospace</code>.')"
@@ -623,18 +650,19 @@
       "descriptionDe": [
         "Definiere für alle <code>p</code> Elemente die Schriftart \"Monospace\".",
         "Du kannst einem Element mit \"font-family\" eine Schriftart zuweisen.",
-        "Wenn du zum Beispiel deinem <code>h2</code> Element die Schriftart \"Sans-serif\" zuweisen willst, kannst du das mit dem folgenden CSS tun: <code>h2 { font-family: Sans-serif; }</code>."
+        "Wenn du zum Beispiel deinem <code>h2</code> Element die Schriftart \"Sans-serif\" zuweisen willst, kannst du das mit dem folgenden CSS tun: <code>h2 { font-family: Sans-serif; }</code>"
       ]
     },
     {
       "id": "bad87fee1348bd9aedf08807",
       "title": "Import a Google Font",
       "description": [
-        "Apply the <code>font-family</code> of <code>Lobster</code> to your <code>h2</code> element.",
+        "Now, let's import and apply a Google font (note that if Google is blocked in your country, you will need to skip this challenge).",
         "First, you'll need to make a <code>call</code> to Google to grab the <code>Lobster</code> font and load it into your HTML.",
-        "Copy the following code snippet and paste it into your code editor:",
-        "<code>&#60;link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\"&#62;</code>.",
-        "Now you can set <code>Lobster</code> as a font-family value on your <code>h2</code> element."
+        "Copy the following code snippet and paste it into the top of your code editor:",
+        "<code>&#60;link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\"&#62;</code>",
+        "Now you can set <code>Lobster</code> as a font-family value on your <code>h2</code> element.",
+        "Apply the <code>font-family</code> of <code>Lobster</code> to your <code>h2</code> element."
       ],
       "tests": [
         "assert(new RegExp(\"googleapis\", \"gi\").test(editor), 'Import the <code>Lobster</code> font.')",
@@ -675,7 +703,7 @@
         "Füge dem <code>h2</code> Element die Schriftart oder <code>font-family</code> \"Lobster\" hinzu.",
         "Zuerst musst du Google Fonts in dein HTML einbinden, um auf \"Lobster\" zugreifen zu können.",
         "Kopiere den folgenden Code und füge diesen in deinen Editor über dem <code>style</code> Element ein:",
-        "<code>&#60;link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\"&#62;</code>.",
+        "<code>&#60;link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\"&#62;</code>",
         "Jetzt kannst du \"Lobster\" als font-family Attribut zu deinem <code>h2</code> Element hinzufügen."
       ]
     },
@@ -683,8 +711,12 @@
       "id": "bad87fee1348bd9aedf08808",
       "title": "Specify How Fonts Should Degrade",
       "description": [
-        "There are several default fonts that are available in all browsers. These include <code>Monospace</code>, <code>Serif</code> and <code>Sans-Serif</code>. Leave <code>Lobster</code> as the font-family for your <code>h2</code> elements. Make them \"degrade\" to <code>Monospace</code> when <code>Lobster</code> isn't available.",
-        "For example, if you wanted an element to use the <code>Helvetica</code> font, but also degrade to the <code>Sans-Serif</code> font when <code>Helvetica</code> wasn't available, you could use this CSS style: <code>p { font-family: Helvetica, Sans-Serif; }</code>.",
+        "There are several default fonts that are available in all browsers. These include <code>Monospace</code>, <code>Serif</code> and <code>Sans-Serif</code>",
+        "When one font isn't available, you can tell the browser to \"degrade\" to another font.",
+        "For example, if you wanted an element to use the <code>Helvetica</code> font, but also degrade to the <code>Sans-Serif</code> font when <code>Helvetica</code> wasn't available, you could use this CSS style:",
+        "<code>p {</code>",
+        "<code>&thinsp;&thinsp;font-family: Helvetica, Sans-Serif;</code>",
+        "<code>}</code>",
         "Now comment out your call to Google Fonts, so that the <code>Lobster</code> font isn't available. Notice how it degrades to the <code>Monospace</code> font."
       ],
       "tests": [
@@ -731,7 +763,7 @@
       "descriptionDe": [
         "Füge allen <code>h2</code> Elementen die Schriftart \"Lobster\" hinzu und definiere \"Monospace\" als Ersatzschrift, wenn \"Lobster\" nicht verfügbar ist.",
         "Du kannst \"Lobster\" als Schriftart deines <code>h2</code> Elements belassen, aber gleichzeitig dafür sorgen, dass eine alternative Schrift geladen wird, wenn \"Lobster\" nicht zur Verfügung steht.",
-        "Wenn du zum Beispiel einem Element die Schriftart \"Helvetica\" geben möchtest, aber gleichzeitig die alternative Schrift \"Sans-Serif\" laden willst, wenn \"Helvetica\" nicht verfügbar ist, kannst du diesen CSS Style verwenden: <code>p { font-family: Helvetica, Sans-Serif; }</code>.",
+        "Wenn du zum Beispiel einem Element die Schriftart \"Helvetica\" geben möchtest, aber gleichzeitig die alternative Schrift \"Sans-Serif\" laden willst, wenn \"Helvetica\" nicht verfügbar ist, kannst du diesen CSS Style verwenden: <code>p { font-family: Helvetica, Sans-Serif; }</code>",
         "Es gibt verschiedene Schriftarten, die jedem Browser standardmäßig zur Verfügung stehen. Das sind unter anderem \"Monospace\", \"Serif\" und \"Sans-Serif\". Probiere deinem <code>h2</code> Element gleichzeitig die Schriftart \"Lobster\" und als Alternative \"Monospace\" zu geben.",
         "Jetzt versuche den Aufruf von Google Fonts in deinem HTML auszukommentieren, sodass \"Lobster\" nicht zur Verfügung steht. Beachte, wie nun die Schriftart \"Monospace\" geladen wird."
       ]
@@ -741,8 +773,11 @@
       "title": "Add Images to your Website",
       "description": [
         "You can add images to your website by using the <code>img</code> element, and point to a specific image's URL using the <code>src</code> attribute.",
-        "An example of this would be <code>&#60img src=\"http://www.your-image-source.com/your-image.jpg\"&#62</code>. Note that in most cases, <code>img</code> elements are self-closing.",
-        "Try it with this image: <code>https://bit.ly/fcc-relaxing-cat</code>."
+        "An example of this would be:",
+        "<code>&#60img src=\"http://www.your-image-source.com/your-image.jpg\"&#62</code>",
+        "Note that in most cases, <code>img</code> elements are self-closing.",
+        "Try it with this image:",
+        "<code>https://bit.ly/fcc-relaxing-cat</code>"
       ],
       "tests": [
         "assert($(\"img\").length > 0, 'Your page should have an image element.')",
@@ -787,7 +822,7 @@
         "Nutze ein <code>img</code> Element um das Bild <code>https://bit.ly/fcc-relaxing-cat</code> einzufügen.",
         "Du kannst <code>img</code> Elemente verwenden, um Bilder in deine Website einzubauen. Um zur URL des Bildes zu verweisen, benutzt du das <code>src</code> Attribut.",
         "Ein Beispiel dafür wäre <code>&#60img src=\"www.bild-quelle.com/bild.jpg\"/&#62</code>. Beachte, dass <code>img</code> Elemente in den meisten Fällen selbstschließend sind.",
-        "Versuche es mit diesem Bild: <code>https://bit.ly/fcc-relaxing-cat</code>."
+        "Versuche es mit diesem Bild: <code>https://bit.ly/fcc-relaxing-cat</code>"
       ]
     },
     {
@@ -795,7 +830,12 @@
       "title": "Size your Images",
       "description": [
         "CSS has a property called <code>width</code> that controls an element's width. Just like with fonts, we'll use <code>px</code> (pixels) to specify the image's width.",
-        "For example, if we wanted to create a CSS class called <code>larger-image</code> that gave HTML elements a width of 500 pixels, we'd use: <code>&#60;style&#62; .larger-image { width: 500px; } &#60;/style&#62;</code>.",
+        "For example, if we wanted to create a CSS class called <code>larger-image</code> that gave HTML elements a width of 500 pixels, we'd use:",
+        "<code>&#60;style&#62;</code>",
+        "<code>&thinsp;&thinsp;.larger-image {</code>",
+        "<code>&thinsp;&thinsp;&thinsp;&thinsp;width: 500px;</code>",
+        "<code>&thinsp;&thinsp;}</code>",
+        "<code>&#60;/style&#62;</code>",
         "Create a class called <code>smaller-image</code> and use it to resize the image so that it's only 100 pixels wide."
       ],
       "tests": [
@@ -842,17 +882,25 @@
       "descriptionDe": [
         "Erstelle eine Klasse mit dem Namen <code>smaller-image</code> und verwende sie, um dein Bild auf 100 Pixel zu skalieren.",
         "Die Breite eines Elements wird mit dem CSS Attribut <code>width</code> kontrolliert. Wie bei Schriftarten verwenden wir Pixel (px) um die Größe zu definieren.",
-        "Wenn wir also die CSS Klasse \"larger-image\" erstellen wollen, um HTML Elementen eine Breite von 500 Pixeln zu verleihen, verwenden wir: <code>&#60;style&#62; .larger-image { width: 500px; } &#60;/style&#62;</code>."
+        "Wenn wir also die CSS Klasse \"larger-image\" erstellen wollen, um HTML Elementen eine Breite von 500 Pixeln zu verleihen, verwenden wir: <code>&#60;style&#62; .larger-image { width: 500px; } &#60;/style&#62;</code>"
       ]
     },
     {
       "id": "bad87fee1348bd9bedf08813",
       "title": "Add Borders Around your Elements",
       "description": [
-        "CSS borders have properties like <code>style</code>, <code>color</code> and <code>width</code>.",
-        "For example, if we wanted to create a red, 5 pixel border around an HTML element, we could use this class: <code>&#60;style&#62; .thin-red-border { border-color: red; border-width: 5px; border-style: solid; } &#60;/style&#62;</code>.",
+        "CSS borders have properties like <code>style</code>, <code>color</code> and <code>width</code>",
+        "For example, if we wanted to create a red, 5 pixel border around an HTML element, we could use this class:",
+        "<code>&#60;style&#62;</code>",
+        "<code>&thinsp;&thinsp;.thin-red-border {</code>",
+        "<code>&thinsp;&thinsp;&thinsp;&thinsp;border-color: red;</code>",
+        "<code>&thinsp;&thinsp;&thinsp;&thinsp;border-width: 5px;</code>",
+        "<code>&thinsp;&thinsp;&thinsp;&thinsp;border-style: solid;</code>",
+        "<code>&thinsp;&thinsp;}</code>",
+        "<code>&#60;/style&#62;</code>",
         "Create a class called <code>thick-green-border</code> that puts a 10-pixel-wide green border with a style of <code>solid</code> around an HTML element, and apply that class to your cat photo.",
-        "Remember that you can apply multiple classes to an element by separating each class with a space within its <code>class</code> attribute. For example: <code>&lt;img class=\"class1 class2\"&gt;</code>"
+        "Remember that you can apply multiple classes to an element by separating each class with a space within its <code>class</code> attribute. For example:",
+         "<code>&lt;img class=\"class1 class2\"&gt;</code>"
       ],
       "tests": [
         "assert($(\"img\").hasClass(\"smaller-image\"), 'Your <code>img</code> element should have the class <code>smaller-image</code>.')",
@@ -905,7 +953,7 @@
       "descriptionDe": [
         "Erstelle die Klasse \"thick-green-border\", welche einen 10 Pixel dicken, grünen Rahmen mit dem Style \"solid\" um ein HTML Element setzt. Füge diese Klasse zu deinem Katzenfoto hinzu.",
         "CSS Rahmen haben Attribute wie Style, Color und Width.",
-        "Wenn wir nun einen roten, 5 Pixel dicken Rahmen um ein HTML Element setzen wollen, würden wir so vorgehen: <code>&#60;style&#62; .thin-red-border { border-color: red; border-width: 5px; border-style: solid; } &#60;/style&#62;</code>."
+        "Wenn wir nun einen roten, 5 Pixel dicken Rahmen um ein HTML Element setzen wollen, würden wir so vorgehen: <code>&#60;style&#62; .thin-red-border { border-color: red; border-width: 5px; border-style: solid; } &#60;/style&#62;</code>"
       ]
     },
     {
@@ -1044,12 +1092,13 @@
         "<code>a</code> elements, also known as <code>anchor</code> elements, are used to link to content outside of the current page.",
         "Here's a diagram of an <code>a</code> element. In this case, the <code>a</code> element is used in the middle of a paragraph element, which means the link will appear in the middle of a sentence.",
         "<a href=\"http://i.imgur.com/hviuZwe.png\" data-lightbox=\"img-enlarge\"><img class=\"img-responsive\" title=\"Click to enlarge\" alt=\"a diagram of how anchor tags are composed with the same text as on the following line\" src=\"http://i.imgur.com/hviuZwe.png\"></a>",
-        "Here's an example: <code>&#60;p&#62;Here's a &#60;a href=\"http://freecodecamp.com\"&#62; link to Free Code Camp&#60;/a&#62; for you to follow.&#60;/p&#62;</code>.",
+        "Here's an example:",
+         "<code>&#60;p&#62;Here's a &#60;a href=\"http://freecodecamp.com\"&#62; link to Free Code Camp&#60;/a&#62; for you to follow.&#60;/p&#62;</code>",
         "Create an <code>a</code> element that links to <code>http://freecatphotoapp.com</code> and has \"cat photos\" as its <code>anchor text</code>."
       ],
       "tests": [
-        "assert((/cat photos/gi).test($(\"a\").text()), 'Your <code>a</code> element should have the <code>anchor text</code> of \"cat photos\"')",
-        "assert(/http:\\/\\/freecatphotoapp\\.com/gi.test($(\"a\").attr(\"href\")), 'You need an <code>a</code> element that links to <code>http&#58;//freecatphotoapp.com</code>.')",
+        "assert((/cat photos/gi).test($(\"a\").text()), 'Your <code>a</code> element should have the <code>anchor text</code> of \"cat photos\".')",
+        "assert(/http:\\/\\/freecatphotoapp\\.com/gi.test($(\"a\").attr(\"href\")), 'You need an <code>a</code> element that links to <code>http&#58;//freecatphotoapp.com</code>')",
         "assert(editor.match(/<\\/a>/g) && editor.match(/<\\/a>/g).length === editor.match(/<a/g).length, 'Make sure your <code>a</code> element has a closing tag.')"
       ],
       "challengeSeed": [
@@ -1104,7 +1153,7 @@
         "Erstelle ein <code>a</code> Element oder \"Anker Element\", das auf http://freecatphotoapp.com verlinkt und den Link-Text \"cat photos\" oder \"anchor text\" beinhaltet.",
         "So sieht ein <code>a</code> Element aus. In diesem Fall wird es innerhalb eines Paragraphen Elements verwendet. Das bedeutet dein Link wird innerhalb des Satzes erscheinen.",
         "<img class=\"img-responsive\" alt=\"Ein Beispiel wie Anker Tags geschrieben werden.\" src=\"https://www.evernote.com/l/AHSaNaepx_lG9LhhPkVYmagcedpmAeITDsQB/image.png\">",
-        "Hier ist ein Beispiel: <code>&#60;p&#62;Hier ist ein &#60;a href=\"http://freecodecamp.com\"&#62; Link zum Free Code Camp&#60;/a&#62; für dich zum Folgen.&#60;/p&#62;</code>."
+        "Hier ist ein Beispiel: <code>&#60;p&#62;Hier ist ein &#60;a href=\"http://freecodecamp.com\"&#62; Link zum Free Code Camp&#60;/a&#62; für dich zum Folgen.&#60;/p&#62;</code>"
       ]
     },
     {
@@ -1113,7 +1162,8 @@
       "description": [
         "Again, here's a diagram of an <code>a</code> element for your reference:",
         "<a href=\"http://i.imgur.com/hviuZwe.png\" data-lightbox=\"img-enlarge\"><img class=\"img-responsive\" title=\"Click to enlarge\" alt=\"a diagram of how anchor tags are composed with the same text as on the following line\" src=\"http://i.imgur.com/hviuZwe.png\"></a>",
-        "Here's an example: <code>&#60;p&#62;Here's a &#60;a href=\"http://freecodecamp.com\"&#62; link to Free Code Camp&#60;/a&#62; for you to follow.&#60;/p&#62;</code>.",
+        "Here's an example:",
+         "<code>&#60;p&#62;Here's a &#60;a href=\"http://freecodecamp.com\"&#62; link to Free Code Camp&#60;/a&#62; for you to follow.&#60;/p&#62;</code>",
         "<code>Nesting</code> just means putting one element inside of another element.",
         "Now nest your existing <code>a</code> element within a new <code>p</code> element so that the surrounding paragraph says \"View more cat photos\", but where only \"cat photos\" is a link, and the rest of the text is plain text."
       ],
@@ -1256,7 +1306,8 @@
       "title": "Turn an Image into a Link",
       "description": [
         "You can make elements into links by nesting them within an <code>a</code> element.",
-        "Nest your image within an <code>a</code> element. Here's an example: <code>&#60;a href=\"#\"&#62;&#60;img src=\"http://bit.ly/fcc-running-cats\"/&#62;&#60;/a&#62;</code>.",
+        "Nest your image within an <code>a</code> element. Here's an example:",
+         "<code>&#60;a href=\"#\"&#62;&#60;img src=\"http://bit.ly/fcc-running-cats\"/&#62;&#60;/a&#62;</code>",
         "Remember to use <code>#</code> as your <code>a</code> element's <code>href</code> property in order to turn it into a dead link.",
         "Once you've done this, hover over your image with your cursor. Your cursor's normal pointer should become the link clicking pointer. The photo is now a link."
       ],
@@ -1318,7 +1369,7 @@
       "descriptionDe": [
         "Umschließe dein <code>img</code> Element mit einem <code>a</code> Element als toten Link.",
         "Du kannst jedes Element in einen Link verwandeln, indem du es mit einem <code>a</code> Element umschließt.",
-        "Umschließe nun dein Bild mit einem <code>a</code> Element. Hier ist ein Beispiel: <code>&#60;a href=\"#\"&#62;&#60;img src=\"http://bit.ly/fcc-running-cats\"/&#62;&#60;/a&#62;</code>.",
+        "Umschließe nun dein Bild mit einem <code>a</code> Element. Hier ist ein Beispiel: <code>&#60;a href=\"#\"&#62;&#60;img src=\"http://bit.ly/fcc-running-cats\"/&#62;&#60;/a&#62;</code>",
         "Vergewissere dich, dass du ein Hash Symbol (#) innerhalb des <code>href</code> Attributs des <code>a</code> Elements nutzt, um daraus einen toten Link zu machen.",
         "Sobald du das gemacht hast, kannst du mit der Maus über dein Bild fahren. Der normale Mauszeiger sollte nun zu einer Hand für Links werden. Das Bild ist jetzt ein Link."
       ]
@@ -1329,11 +1380,12 @@
       "description": [
         "<code>alt</code> attributes, also known as <code>alt text</code>, are what browsers will display if they fail to load the image. <code>alt</code> attributes are also important for blind or visually impaired users to understand what an image portrays. And search engines also look at <code>alt</code> attributes.",
         "In short, every image should have an <code>alt</code> attribute!",
-        "You can add an <code>alt</code> attribute right in the img element like this: <code>&#60img src=\"www.your-image-source.com/your-image.jpg\" alt=\"your alt text\"&#62</code>.",
+        "You can add an <code>alt</code> attribute right in the img element like this:",
+         "<code>&#60img src=\"www.your-image-source.com/your-image.jpg\" alt=\"your alt text\"&#62</code>",
         "Add an <code>alt</code> attribute with the text <code>A cute orange cat lying on its back</code> to our cat photo."
       ],
       "tests": [
-        "assert($(\"img\").filter(function(){ return /cat/gi.test(this.alt) }).length > 0, 'Your image element should have an <code>alt</code> attribute set to <code>A cute orange cat lying on its back</code>.')"
+        "assert($(\"img\").filter(function(){ return /cat/gi.test(this.alt) }).length > 0, 'Your image element should have an <code>alt</code> attribute set to <code>A cute orange cat lying on its back</code>')"
       ],
       "challengeSeed": [
         "<link href=\"http://fonts.googleapis.com/css?family=Lobster\" rel=\"stylesheet\" type=\"text/css\">",
@@ -1390,7 +1442,7 @@
         "<code>alt</code> Attribute – auch \"Alt Text\" genannt – werden vom Browser angezeigt, wenn sie ein Bild nicht laden können. Für blinde oder visuell eingeschränkte Menschen sind sie ebenfalls wichtig um zu verstehen, was ein Bild darstellt. Zudem werden diese Texte von Suchmaschinen genutzt.",
         "Kurz gesagt: Jedes Bild sollte ein <code>alt</code> Attribut beinhalten!",
         "<code>alt</code> Attribute sind nützlich um Personen – und Web Crawlers wie Google – zu sagen was in einem Foto abgebildet wird. Das ist extrem wichtig, damit blinde oder visuell eingeschränkte Menschen den Inhalt der Website verstehen.",
-        "Du kannst das <code>alt</code> Attribut direkt in das Img Element einfügen: <code>&#60img src=\"www.bild-quelle.com/bild.jpg\" alt=\"Dein Alt Text.\"/&#62</code>."
+        "Du kannst das <code>alt</code> Attribut direkt in das Img Element einfügen: <code>&#60img src=\"www.bild-quelle.com/bild.jpg\" alt=\"Dein Alt Text.\"/&#62</code>"
       ]
     },
     {
@@ -1478,10 +1530,10 @@
         "Ordered lists start with a <code>&#60;ol&#62;</code> element. Then they contain some number of <code>&#60;li&#62;</code> elements.",
         "For example:",
         "<code>&#60;ol&#62;</code>",
-        "&thinsp;&thinsp;<code>&#60;li&#62;hydrogen&#60;/li&#62;</code>",
-        "&thinsp;&thinsp;<code>&#60;li&#62;helium&#60;/li&#62;</code>",
+        "&thinsp;&thinsp;<code>&#60;li&#62;Garfield&#60;/li&#62;</code>",
+        "&thinsp;&thinsp;<code>&#60;li&#62;Sylvester&#60;/li&#62;</code>",
         "<code>&#60;/ol&#62;</code>",
-        "would create a numbered list of \"hydrogen\" and \"helium\".",
+        "would create a numbered list of \"Garfield\" and \"Sylvester\".",
         "Create an ordered list of the top 3 things cats hate the most."
       ],
       "tests": [
@@ -1559,9 +1611,11 @@
       "id": "bad87fee1348bd9aedf08829",
       "title": "Create a Text Field",
       "description": [
-        "Now let's create a web <code>form</code>.",
+        "Now let's create a web form.",
         "Text inputs are a convenient way to get input from your user.",
-        "You can create one like this: <code>&#60;input type=\"text\"&#62;</code>. Note that <code>input</code> elements are self-closing.",
+        "You can create one like this:",
+         "<code>&#60;input type=\"text\"&#62;</code>",
+        "Note that <code>input</code> elements are self-closing.",
         "Create an <code>input</code> element of type <code>text</code> below your lists."
       ],
       "tests": [
@@ -1638,7 +1692,8 @@
       "title": "Add Placeholder Text to a Text Field",
       "description": [
         "Your placeholder text is what appears in your text <code>input</code> before your user has inputed anything.",
-        "You can create placeholder text like so: <code>&#60;input type=\"text\" placeholder=\"this is placeholder text\"&#62;</code>.",
+        "You can create placeholder text like so:",
+         "<code>&#60;input type=\"text\" placeholder=\"this is placeholder text\"&#62;</code>",
         "Set the <code>placeholder</code> value of your text <code>input</code> to \"cat photo URL\"."
       ],
       "tests": [
@@ -1709,7 +1764,7 @@
       "descriptionDe": [
         "Setze bei deinem <code>input</code> Element den Wert für <code>placeholder</code> auf \"cat photo URL\".",
         "Platzhalter erscheinen in <code>input</code> Feldern, bevor der Nutzer etwas eingibt.",
-        "Du kannst Platzhalter auf folgende Weise erstellen: <code>&#60;input type=\"text\" placeholder=\"Das ist ein Platzhalter.\"&#62;</code>."
+        "Du kannst Platzhalter auf folgende Weise erstellen: <code>&#60;input type=\"text\" placeholder=\"Das ist ein Platzhalter.\"&#62;</code>"
       ]
     },
     {
@@ -1717,12 +1772,13 @@
       "title": "Create a Form Element",
       "description": [
         "You can build web forms that actually submit data to a server using nothing more than pure HTML. You can do this by specifying an action on your <code>form</code> element.",
-        "For example: <code>&#60;form action=\"/url-where-you-want-to-submit-form-data\"&#62;&#60;/form&#62;</code>.",
+        "For example:",
+         "<code>&#60;form action=\"/url-where-you-want-to-submit-form-data\"&#62;&#60;/form&#62;</code>",
         "Nest your text field in a <code>form</code> element. Add the <code>action=\"/submit-cat-photo\"</code> attribute to this form element."
       ],
       "tests": [
         "assert($(\"form\") && $(\"form\").children(\"input\") && $(\"form\").children(\"input\").length > 0, 'Nest your text input element within a <code>form</code> element.')",
-        "assert($(\"form\").attr(\"action\") === \"/submit-cat-photo\", 'Make sure your <code>form</code> has an <code>action</code> attribute which is set to <code>/submit-cat-photo</code>.')",
+        "assert($(\"form\").attr(\"action\") === \"/submit-cat-photo\", 'Make sure your <code>form</code> has an <code>action</code> attribute which is set to <code>/submit-cat-photo</code>')",
         "assert(editor.match(/<\\/form>/g) && editor.match(/<form/g) && editor.match(/<\\/form>/g).length === editor.match(/<form/g).length, 'Make sure your <code>form</code> element has a closing tag.')"
       ],
       "challengeSeed": [
@@ -1789,7 +1845,7 @@
       "descriptionDe": [
         "Umschließe dein Textfeld mit einem <code>form</code> Element. Füge anschließend das Attribut <code>action=\"/submit-cat-photo\"</code> hinzu.",
         "Du kannst Web Formulare bauen, die Daten zu einem Server übertragen – und das nur mit HTML. Das wird möglich, indem du eine Aktion für dein <code>form</code> Element bestimmst.",
-        "Zum Beispiel: <code>&#60;form action=\"/url-wohin-du-deine-formular-daten-senden-willst\"&#62;&#60;/form&#62;</code>."
+        "Zum Beispiel: <code>&#60;form action=\"/url-wohin-du-deine-formular-daten-senden-willst\"&#62;&#60;/form&#62;</code>"
       ]
     },
     {
@@ -1797,7 +1853,8 @@
       "title": "Add a Submit Button to a Form",
       "description": [
         "Let's add a <code>submit</code> button to your form. Clicking this button will send the data from your form to the URL you specified with your form's <code>action</code> attribute.",
-        "Here's an example submit button: <code>&#60;button type=\"submit\"&#62;this button submits the form&#60;/button&#62;</code>.",
+        "Here's an example submit button:",
+        "<code>&#60;button type=\"submit\"&#62;this button submits the form&#60;/button&#62;</code>",
         "Add a submit button to your <code>form</code> element with type <code>submit</code> and \"Submit\" as its text."
       ],
       "tests": [
@@ -1872,7 +1929,7 @@
       "descriptionDe": [
         "Füge eine Schaltfläche zum Senden mit dem Typ \"submit\" und \"Submit\" als Text zu deinem <code>form</code> Element hinzu.",
         "Lass uns nun eine Schaltfläche zum Senden zu deinem Formlar hinzufügen. Durch einen Klick auf diese Schaltfläche werden die Daten des Formulars an die URL gesendet, welche du in dem <code>action</code> Attribut deines Formulars angegeben hast.",
-        "Hier ist ein Beispiel einer solchen Schaltfläche: <code>&#60;button type=\"submit\"&#62;Diese Schaltfläche überträgt die Daten des Formulars.&#60;/button&#62;</code>."
+        "Hier ist ein Beispiel einer solchen Schaltfläche: <code>&#60;button type=\"submit\"&#62;Diese Schaltfläche überträgt die Daten des Formulars.&#60;/button&#62;</code>"
       ]
     },
     {
@@ -1880,8 +1937,9 @@
       "title": "Use HTML5 to Require a Field",
       "description": [
         "You can require specific form fields so that your user will not be able to submit your form until he or she has filled them out.",
-        "For example, if you wanted to make a text input field required, you can just add the word <code>required</code> within your <code>input</code> element, you would use: <code>&#60;input type=\"text\" required&#62;</code>.",
-        "Make your text <code>input</code> a <code>required</code> field, so that your user can't submit the form without completing this field."
+        "For example, if you wanted to make a text input field required, you can just add the word <code>required</code> within your <code>input</code> element, you would use: <code>&#60;input type=\"text\" required&#62;</code>",
+        "Make your text <code>input</code> a <code>required</code> field, so that your user can't submit the form without completing this field.",
+        "Then try to submit the form without inputing any text. See how your HTML5 form notifies you that the field is required?"
       ],
       "tests": [
         "assert($(\"input\").prop(\"required\"), 'Your text <code>input</code> element should have the <code>required</code> attribute.')"
@@ -1953,7 +2011,7 @@
       "descriptionDe": [
         "Mache aus deinem <code>input</code> Feld ein Pflichtfeld – \"required\" – damit deine Nutzer das Formular nicht abschicken können, ohne dieses Feld auszufüllen.",
         "Du kannst bestimmte Felder eines Formulars als Pflichtfelder deklarieren. Damit ist es deinen Nutzern nicht mehr möglich, das Formular abzuschicken, ohne die Pflichtfelder auszufüllen.",
-        "Um zum Beispiel ein Textfeld als Pflichtfeld zu deklarieren, kannst du einfach ein \"required\" innerhalb deines <code>input</code> Elements hinzufügen: <code>&#60;input type=\"text\" required&#62;</code>."
+        "Um zum Beispiel ein Textfeld als Pflichtfeld zu deklarieren, kannst du einfach ein \"required\" innerhalb deines <code>input</code> Elements hinzufügen: <code>&#60;input type=\"text\" required&#62;</code>"
       ]
     },
     {
@@ -1961,17 +2019,18 @@
       "title": "Create a Set of Radio Buttons",
       "description": [
         "You can use <code>radio buttons</code> for questions where you want the user to only give you one answer.",
-        "Radio buttons are a type of <code>input</code>.",
+        "Radio buttons are a type of <code>input</code>",
         "Each of your radio buttons should be nested within its own <code>label</code> element.",
         "All related radio buttons should have the same <code>name</code> attribute.",
-        "Here's an example of a radio button: <code>&#60;label&#62;&#60;input type=\"radio\" name=\"indoor-outdoor\"&#62; Indoor&#60;/label&#62;</code>.",
+        "Here's an example of a radio button:",
+        "<code>&#60;label&#62;&#60;input type=\"radio\" name=\"indoor-outdoor\"&#62; Indoor&#60;/label&#62;</code>",
         "Add to your form a pair of radio buttons. Each radio button should be nested within its own <code>label</code> element. They should share a common <code>name</code> attribute. One should have the option of <code>indoor</code> and the other should have the option of <code>outdoor</code>."
       ],
       "tests": [
         "assert($('input[type=\"radio\"]').length > 1, 'Your page should have two radio button elements.')",
         "assert($('label > input[type=\"radio\"]').filter(\"[name='indoor-outdoor']\").length > 1, 'Give your radio buttons the <code>name</code> attribute of <code>indoor-outdoor</code>.')",
         "assert($('label > input[type=\"radio\"]:only-child').length > 1, 'Each of your two radio button elements should be nested in its own <code>label</code> element.')",
-        "assert(editor.match(/<\\/label>/g) && editor.match(/<label/g) && editor.match(/<\\/label>/g).length === editor.match(/<label/g).length, 'Make sure each of your <code>label</code> elements has a closing tag.')",
+        "assert((editor.match(/<\\/label>/g) && editor.match(/<label/g) && editor.match(/<\\/label>/g).length === editor.match(/<label/g).length), 'Make sure each of your <code>label</code> elements has a closing tag.')",
         "assert($(\"label\").text().match(/indoor/gi), 'One of your radio buttons should have the label <code>indoor</code>.')",
         "assert($(\"label\").text().match(/outdoor/gi), 'One of your radio buttons should have the label <code>outdoor</code>.')"
       ],
@@ -2045,7 +2104,7 @@
         "Optionsfelder sind lediglich ein weiterer Typ von <code>input</code> Elementen.",
         "Jedes deiner Optionsfelder sollte innerhalb des eigenen <code>label</code> Elements liegen.",
         "Alle Optionsfelder mit Bezug zueinander sollten das gleiche <code>name</code> Attribut teilen.",
-        "Ein Beispiel eines Optionsfeldes: <code>&#60;label&#62;&#60;input type=\"radio\" name=\"indoor-outdoor\"&#62; Indoor&#60;/label&#62;</code>."
+        "Ein Beispiel eines Optionsfeldes: <code>&#60;label&#62;&#60;input type=\"radio\" name=\"indoor-outdoor\"&#62; Indoor&#60;/label&#62;</code>"
       ]
     },
     {
@@ -2053,10 +2112,11 @@
       "title": "Create a Set of Checkboxes",
       "description": [
         "Forms commonly use <code>checkboxes</code> for questions that may have more than one answer.",
-        "Checkboxes are a type of <code>input</code>.",
+        "Checkboxes are a type of <code>input</code>",
         "Each of your checkboxes should be nested within its own <code>label</code> element.",
         "All related checkbox inputs should have the same <code>name</code> attribute.",
-        "Here's an example of a checkbox: <code>&#60;label&#62;&#60;input type=\"checkbox\" name=\"personality\"&#62; Loving&#60;/label&#62;</code>.",
+        "Here's an example of a checkbox:",
+        "<code>&#60;label&#62;&#60;input type=\"checkbox\" name=\"personality\"&#62; Loving&#60;/label&#62;</code>",
         "Add to your form a set of three checkboxes. Each checkbox should be nested within its own <code>label</code> element. All three should share the <code>name</code> attribute of <code>personality</code>."
       ],
       "tests": [
@@ -2134,7 +2194,7 @@
       "descriptionDe": [
         "Füge deinem Formular drei Kontrollkästchen hinzu. Jedes dieser Elemente sollte innerhalb seines eigenen <code>label</code> Elements stehen. Alle sollten das gleiche <code>name</code> Attribut \"personality\" teilen.",
         "Formulare nutzen Kontrollkästchen meistens für Fragen, die mehrerer Antworten bedürfen.",
-        "Als Beispiel: <code>&#60;label&#62;&#60;input type=\"checkbox\" name=\"personality\"&#62; liebevoll&#60;/label&#62;</code>."
+        "Als Beispiel: <code>&#60;label&#62;&#60;input type=\"checkbox\" name=\"personality\"&#62; liebevoll&#60;/label&#62;</code>"
       ]
     },
     {
@@ -2142,7 +2202,8 @@
       "title": "Check Radio Buttons and Checkboxes by Default",
       "description": [
         "You can set a checkbox or radio button to be checked by default using the <code>checked</code> attribute.",
-        "To do this, just add the word \"checked\" to the inside of an input element. For example, <code>&#60;input type=\"radio\" name=\"test-name\" checked&#62;</code>.",
+        "To do this, just add the word \"checked\" to the inside of an input element. For example:",
+        "<code>&#60;input type=\"radio\" name=\"test-name\" checked&#62;</code>",
         "Set the first of your <code>radio buttons</code> and the first of your <code>checkboxes</code> to both be checked by default."
       ],
       "tests": [
@@ -2221,7 +2282,7 @@
       "descriptionDe": [
         "Stelle sicher, dass jeweilse dein erstes Optionsfeld und Kontrollkästchen standardmäßig markiert sind.",
         "Das kannst du erreichen, indem beiden das Attribut <code>checked</code> beigefügt wird.",
-        "Um das zu bewerkstelligen, füge einfach \"checked\" innerhalb eines Eingabefeldes hinzu. Als Beispiel: <code>&#60;input type=\"radio\" name=\"test-name\" checked&#62;</code>."
+        "Um das zu bewerkstelligen, füge einfach \"checked\" innerhalb eines Eingabefeldes hinzu. Als Beispiel: <code>&#60;input type=\"radio\" name=\"test-name\" checked&#62;</code>"
       ]
     },
     {
@@ -2315,7 +2376,7 @@
         "Das <code>div</code> Element oder \"Division\" ist ein allgemeiner Container für andere Elemente.",
         "Dieses Element wird von allen HTML Elementen wahrscheinlich am häufigsten verwendet. Es ist nützlich um die CSS Stile der eigenen Klasse an die enthaltenen Elemente zu vererben.",
         "Wie jedes andere Element – das sich nicht selbst schließt –  kannst du ein <code>div</code> Element mit <code>&#60;div&#62;</code> öffnen und mit <code>&#60;/div&#62;</code> wieder schließen.",
-        "Versuche deine öffnende <code>div</code> Auszeichnung überhalb des <code>p</code> Elements von  \"Things cats love\" und das schließende <code>div</code> unterhalb der schließenden <code>ol</code> Auszeichnung zu platzieren. Damit befinden sich beide Listen innerhalb eines <code>div</code>."
+        "Versuche deine öffnende <code>div</code> Auszeichnung überhalb des <code>p</code> Elements von  \"Things cats love\" und das schließende <code>div</code> unterhalb der schließenden <code>ol</code> Auszeichnung zu platzieren. Damit befinden sich beide Listen innerhalb eines <code>div</code>"
       ]
     },
     {
@@ -2323,7 +2384,10 @@
       "title": "Give a Background Color to a Div Element",
       "description": [
         "You can set an element's background color with the <code>background-color</code> property.",
-        "For example, if you wanted an element's background color to be <code>green</code>, you'd use <code>.green-background { background-color: green; }</code> within your <code>style</code> element.",
+        "For example, if you wanted an element's background color to be <code>green</code>, you'd put this within your <code>style</code> element:",
+        "<code>.green-background {</code>",
+        "<code>&thinsp;&thinsp;background-color: green;</code>",
+        "<code>}</code>",
         "Create a class called <code>gray-background</code> with the <code>background-color</code> of gray. Assign this class to your <code>div</code> element."
       ],
       "tests": [
@@ -2411,7 +2475,8 @@
         "In addition to classes, each HTML element can also have an <code>id</code> attribute.",
         "There are several benefits to using <code>id</code> attributes, and you'll learn more about them once you start using jQuery.",
         "<code>id</code> attributes should be unique. Browsers won't enforce this, but it is a widely agreed upon best practice. So please don't give more than one element the same <code>id</code> attribute.",
-        "Here's an example of how you give your <code>h2</code> element the id of <code>cat-photo-app</code>: <code>&#60;h2 id=\"cat-photo-app\"></code>",
+        "Here's an example of how you give your <code>h2</code> element the id of <code>cat-photo-app</code>:",
+        "<code>&#60;h2 id=\"cat-photo-app\"></code>",
         "Give your <code>form</code> element the id <code>cat-photo-form</code>."
       ],
       "tests": [
@@ -2499,7 +2564,10 @@
       "title": "Use an ID Attribute to Style an Element",
       "description": [
         "One cool thing about <code>id</code> attributes is that, like classes, you can style them using CSS.",
-        "Here's an example of how you can take your element with the <code>id</code> attribute of <code>cat-photo-element</code> and give it the background color of green. In your <code>style</code> element: <code>#cat-photo-element { background-color: green; }</code>",
+        "Here's an example of how you can take your element with the <code>id</code> attribute of <code>cat-photo-element</code> and give it the background color of green. In your <code>style</code> element:",
+        "<code>#cat-photo-element {</code>",
+        "<code>&thinsp;&thinsp;background-color: green;</code>",
+        "<code>}</code>",
         "Note that inside your <code>style</code> element, you always reference classes by putting a <code>.</code> in front of their names. You always reference ids by putting a <code>#</code> in front of their names.",
         "Try giving your form, which now has the <code>id</code> attribute of <code>cat-photo-form</code>, a green background."
       ],
@@ -2590,6 +2658,7 @@
       "id": "bad88fee1348bd9aedf08825",
       "title": "Adjusting the Padding of an Element",
       "description": [
+        "Now let's put our Cat Photo App away for a little while and learn more about styling HTML.",
         "You may have already noticed this, but all HTML elements are essentially little rectangles.",
         "Three important properties control the space that surrounds each HTML element: <code>padding</code>, <code>margin</code>, and <code>border</code>.",
         "An element's <code>padding</code> controls the amount of space between the element and its <code>border</code>.",
@@ -2651,7 +2720,7 @@
       "nameDe": "Wegpunkt: Justiere den Innenabstand eines Elements",
       "descriptionDe": [
         "Die nächsten Wegpunkte werden dir drei wichtige Aspekte von Raum – und Zeit! – bei HTML Elementen näher bringen: <code>padding</code>, <code>margin</code> und <code>border</code>. Das mit der Zeit war ein Scherz. Gleiche nun den Innenabstand – <code>padding</code> – deiner grünen Box dem der roten Box an.",
-        "<code>padding</code> kontrolliert den Raum oder Abstand zwischen dem Inhalt eines Elements und dessen Rahmen – <code>border</code>.",
+        "<code>padding</code> kontrolliert den Raum oder Abstand zwischen dem Inhalt eines Elements und dessen Rahmen – <code>border</code>",
         "Wir sehen in diesem Beispiel, dass sich die grüne Box und die rote Box innerhalb der gelben Box befinden. Beachte, dass die rote Box mehr <code>padding</code> hat als die grüne Box.",
         "Wenn du den Innenabstand der grünen Box – also <code>padding</code> – erhöhst, wird sich die Entfernung zwischen dem Text \"padding\" und dem Rahmen darum erhöhen."
       ]
@@ -2940,7 +3009,8 @@
       "id": "bad87fee1348bd9aedf08826",
       "title": "Use Clockwise Notation to Specify the Padding of an Element",
       "description": [
-        "Instead of specifying an element's <code>padding-top</code>, <code>padding-right</code>, <code>padding-bottom</code>, and <code>padding-left</code> properties, you can specify them all in one line, like this: <code>padding: 10px 20px 10px 20px;</code>.",
+        "Instead of specifying an element's <code>padding-top</code>, <code>padding-right</code>, <code>padding-bottom</code>, and <code>padding-left</code> properties, you can specify them all in one line, like this:",
+        "<code>padding: 10px 20px 10px 20px;</code>",
         "These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific padding instructions.",
         "Use Clockwise Notation to give the \".green-box\" class a <code>padding</code> of <code>40px</code> on its top and left side, but only <code>20px</code> on its bottom and right side."
       ],
@@ -3000,7 +3070,7 @@
       "nameDe": "Wegpunkt: Nutze die Notation im Uhrzeigersinn um den Innenabstand eines Elements zu bestimmen",
       "descriptionDe": [
         "Gib der Klasse \".green-box\" mit einer Notation im Uhrzeigersinn einen Innenabstand – <code>padding</code> – von 40 Pixeln auf der oberen und linken Seite, aber nur 20 Pixel auf der unteren und rechten Seite.",
-        "Anstatt die Eigenschaften <code>padding-top</code>, <code>padding-right</code>, <code>padding-bottom</code> und <code>padding-left</code> zu verwenden, kannst du sie alle in einer Zeile schreiben: <code>padding: 10px 20px 10px 20px;</code>.",
+        "Anstatt die Eigenschaften <code>padding-top</code>, <code>padding-right</code>, <code>padding-bottom</code> und <code>padding-left</code> zu verwenden, kannst du sie alle in einer Zeile schreiben: <code>padding: 10px 20px 10px 20px;</code>",
         "Diese vier Werte funktionieren wie eine Uhr: oben, rechts, unten und links. Sie bedeuten exakt das selbe wie die seitenspezifischen Anweisungen."
       ]
     },
@@ -3009,7 +3079,8 @@
       "title": "Use Clockwise Notation to Specify the Margin of an Element",
       "description": [
         "Let's try this again, but with <code>margin</code> this time.",
-        "Instead of specifying an element's <code>margin-top</code>, <code>margin-right</code>, <code>margin-bottom</code>, and <code>margin-left</code> properties, you can specify them all in one line, like this: <code>margin: 10px 20px 10px 20px;</code>.",
+        "Instead of specifying an element's <code>margin-top</code>, <code>margin-right</code>, <code>margin-bottom</code>, and <code>margin-left</code> properties, you can specify them all in one line, like this:",
+        "<code>margin: 10px 20px 10px 20px;</code>",
         "These four values work like a clock: top, right, bottom, left, and will produce the exact same result as using the side-specific margin instructions.",
         "Use <code>Clockwise Notation</code> to give the element with the <code>green-box</code> class a margin of <code>40px</code> on its top and left side, but only <code>20px</code> on its bottom and right side."
       ],
@@ -3069,7 +3140,7 @@
       "nameDe": "Wegpunkt: Nutze die Notation im Uhrzeigersinn um den Außenabstand eines Elements zu bestimmen",
       "descriptionDe": [
         "Versuchen wir das noch einmal, aber diesmal mit dem Außenabstand – also <code>margin</code>. Nutze die Notation im Uhrzeigersinn – auch <code>Clockwise Notation</code> genannt – um einem Element 40 Pixel Außenabstand auf der oberen und linken Seite, aber nur 20 Pixel auf der unteren und rechten Seite zu verleihen.",
-        "Anstatt die Eigenschaften <code>margin-top</code>, <code>margin-right</code>, <code>margin-bottom</code> und <code>margin-left</code> zu verwenden, kannst du alle in eine Zeile schreiben: <code>margin: 10px 20px 10px 20px;</code>.",
+        "Anstatt die Eigenschaften <code>margin-top</code>, <code>margin-right</code>, <code>margin-bottom</code> und <code>margin-left</code> zu verwenden, kannst du alle in eine Zeile schreiben: <code>margin: 10px 20px 10px 20px;</code>",
         "Diese vier Werte funktionieren wieder wie eine Uhr: oben, rechts, unten und links. Sie meinen exakt das gleiche wie die seitenspezifischen Anweisungen."
       ]
     },
@@ -3080,7 +3151,10 @@
         "Now let's start fresh and talk about CSS inheritance.",
         "Every HTML page has a <code>body</code> element.",
         "We can prove that the <code>body</code> element exists here by giving it a <code>background-color</code> of black.",
-        "We can do this by adding <code>body { background-color: black; }</code> to our <code>style</code> element."
+        "We can do this by adding the following to our <code>style</code> element:",
+        "<code>body {</code>",
+        "<code>&thinsp;&thinsp;background-color: black;</code>",
+        "<code>}</code>"
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 0)\", 'Give your <code>body</code> element the <code>background-color</code> of black.')"
@@ -3111,7 +3185,7 @@
       "description": [
         "Now we've proven that every HTML page has a <code>body</code> element, and that its <code>body</code> element can also be styled with CSS.",
         "Remember, you can style your <code>body</code> element just like any other HTML element, and all your other elements will inherit your <code>body</code> element's styles.",
-        "First, create a <code>h1</code> element with the text <code>Hello World</code>.",
+        "First, create a <code>h1</code> element with the text <code>Hello World</code>",
         "Then, let's give all elements on your page the color of <code>green</code> by adding <code>color: green;</code> to your <code>body</code> element's style declaration.",
         "Finally, give your <code>body</code> element the font-family of <code>Monospace</code> by adding <code>font-family: Monospace;</code> to your <code>body</code> element's style declaration."
       ],
@@ -3194,7 +3268,8 @@
         "We just proved that our classes will override the <code>body</code> element's CSS. So the next logical question is, what can we do to override our <code>pink-text</code> class?",
         "Create an additional CSS class called <code>blue-text</code> that gives an element the color blue. Make sure it's below your <code>pink-text</code> class declaration.",
         "Apply the <code>blue-text</code> class to your <code>h1</code> element in addition to your <code>pink-text</code> class, and let's see which one wins.",
-        "Applying multiple class attributes to a HTML element is done with a space between them like this: <code>class=\"class1 class2\"</code>"
+        "Applying multiple class attributes to a HTML element is done with a space between them like this:",
+        "<code>class=\"class1 class2\"</code>"
       ],
       "tests": [
         "assert($(\"h1\").hasClass(\"pink-text\"), 'Your <code>h1</code> element should have the class <code>pink-text</code>.')",
@@ -3236,9 +3311,13 @@
         "We just proved that browsers read CSS from top to bottom. That means that, in the event of a conflict, the browser will use whichever CSS declaration came last.",
         "But we're not done yet. There are other ways that you can override CSS. Do you remember id attributes?",
         "Let's override your <code>pink-text</code> and <code>blue-text</code> classes, and make your <code>h1</code> element orange, by giving the <code>h1</code> element an id and then styling that id.",
-        "Give your <code>h1</code> element the <code>id</code> attribute of <code>orange-text</code>. Remember, id styles look like this: <code>&#60;h1 id=\"orange-text\"&#62;</code>",
+        "Give your <code>h1</code> element the <code>id</code> attribute of <code>orange-text</code>. Remember, id styles look like this:",
+        "<code>&#60;h1 id=\"orange-text\"&#62;</code>",
         "Leave the <code>blue-text</code> and <code>pink-text</code> classes on your <code>h1</code> element.",
-        "Create a CSS declaration for your <code>orange-text</code> id in your <code>style</code> element. Here's an example of what this looks like: <code>#brown-text { color: brown; }</code>"
+        "Create a CSS declaration for your <code>orange-text</code> id in your <code>style</code> element. Here's an example of what this looks like:",
+        "<code>#brown-text {</code>",
+        "<code>&thinsp;&thinsp;color: brown;</code>",
+        "<code>}</code>"
       ],
       "tests": [
         "assert($(\"h1\").hasClass(\"pink-text\"), 'Your <code>h1</code> element should have the class <code>pink-text</code>.')",
@@ -3285,7 +3364,8 @@
       "description": [
         "So we've proven that id declarations override class declarations, regardless of where they are declared in your <code>style</code> element CSS.",
         "There are other ways that you can override CSS. Do you remember inline styles?",
-        "Use an <code>in-line style</code> to try to make our <code>h1</code> element white. Remember, in line styles look like this: <code>&#60;h1 style=\"color: green\"&#62;</code>",
+        "Use an <code>in-line style</code> to try to make our <code>h1</code> element white. Remember, in line styles look like this:",
+        "<code>&#60;h1 style=\"color: green\"&#62;</code>",
         "Leave the <code>blue-text</code> and <code>pink-text</code> classes on your <code>h1</code> element."
       ],
       "tests": [
@@ -3335,10 +3415,11 @@
       "description": [
         "Yay! We just proved that in-line styles will override all the CSS declarations in your <code>style</code> element.",
         "But wait. There's one last way to override CSS. This is the most powerful method of all. But before we do it, let's talk about why you would ever want to override CSS.",
-        "In many situations, you will use CSS libraries. These may accidentally override your own CSS. So when you absolutely need to be sure that an element has specific CSS, you can use <code>!important</code>.",
+        "In many situations, you will use CSS libraries. These may accidentally override your own CSS. So when you absolutely need to be sure that an element has specific CSS, you can use <code>!important</code>",
         "Let's go all the way back to our <code>pink-text</code> class declaration. Remember that our <code>pink-text</code> class was overridden by subsequent class declarations, id declarations, and in-line styles.",
         "Let's add the keyword <code>!important</code> to your pink-text element's color declaration to make 100% sure that your <code>h1</code> element will be pink.",
-        "An example of how to do this is: <code>color: red !important;</code>"
+        "An example of how to do this is:",
+        "<code>color: red !important;</code>"
       ],
       "tests": [
         "assert($(\"h1\").hasClass(\"pink-text\"), 'Your <code>h1</code> element should have the class <code>pink-text</code>.')",
@@ -3389,11 +3470,11 @@
         "Did you know there are other ways to represent colors in CSS? One of these ways is called hexadecimal code, or <code>hex code</code> for short.",
         "<code>Decimal</code> means the numbers zero through nine - the numbers that people use in everyday life. <code>Hexadecimal</code> includes these 10 numbers, plus the letters A, B, C, D, E and F. This means that Hexidecimal has a total of 16 possible values, instead of the 10 possible values that our normal base-10 number system gives us.",
         "With CSS, we use 6 hexadecimal numbers to represent colors. For example, <code>#000000</code> is the lowest possible value, and it represents the color black.",
-        "Replace the word <code>black</code> in our <code>body</code> element's background-color with its <code>hex code</code> representation, <code>#000000</code>. "
+        "Replace the word <code>black</code> in our <code>body</code> element's background-color with its <code>hex code</code> representation, <code>#000000</code> "
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 0)\", 'Give your <code>body</code> element the background-color of black.')",
-        "assert(editor.match(/#000000/g) && editor.match(/#000000/g).length > 0, 'Use the <code>hex code</code> for the color black instead of the word <code>black</code>. For example <code>body { color&#58; #000000; }</code>.')"
+        "assert(editor.match(/#000000/g) && editor.match(/#000000/g).length > 0, 'Use the <code>hex code</code> for the color black instead of the word <code>black</code>. For example <code>body { color&#58; #000000; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3423,11 +3504,11 @@
       "description": [
         "<code>0</code> is the lowest number in hex code, and represents a complete absence of color.",
         "<code>F</code> is the highest number in hex code, and it represents the maximum possible brightness.",
-        "Let's turn our <code>body</code> element's background-color white by changing its hex code to <code>#FFFFFF</code>."
+        "Let's turn our <code>body</code> element's background-color white by changing its hex code to <code>#FFFFFF</code>"
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(255, 255, 255)\", 'Your <code>body</code> element should have the <code>background-color</code> of white.')",
-        "assert(editor.match(/#FFFFFF/ig) && editor.match(/#FFFFFF/ig).length > 0, 'Use the <code>hex code</code> for the color white instead of the word <code>white</code>. For example <code>body { color&#58; #FFFFFF; }</code>.')"
+        "assert(editor.match(/#FFFFFF/ig) && editor.match(/#FFFFFF/ig).length > 0, 'Use the <code>hex code</code> for the color white instead of the word <code>white</code>. For example <code>body { color&#58; #FFFFFF; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3459,11 +3540,11 @@
         "How many colors are possible? 16 values and 6 positions means we have 16 to the 6th power, or more than 16 million possible colors.",
         "Hex code follows the red-green-blue, or <code>rgb</code> format. The first two digits of hex code represent the amount of red in the color. The third and fourth digit represent the amount of green. The fifth and sixth represent the amount of blue.",
         "So to get the absolute brightest red, you would just use <code>F</code> for the first and second digits (the highest possible value) and <code>0</code> for the third, fourth, fifth and sixth digits (the lowest possible value).",
-        "Make the <code>body</code> element's background color red by giving it the hex code value of <code>#FF0000</code>."
+        "Make the <code>body</code> element's background color red by giving it the hex code value of <code>#FF0000</code>"
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(255, 0, 0)\", 'Give your <code>body</code> element the <code>background-color</code> of red.')",
-        "assert(editor.match(/#FF0000/ig) && editor.match(/#FF0000/ig).length > 0, 'Use the <code>hex code</code> for the color red instead of the word <code>red</code>. For example <code>body { color&#58; #FF0000; }</code>.')"
+        "assert(editor.match(/#FF0000/ig) && editor.match(/#FF0000/ig).length > 0, 'Use the <code>hex code</code> for the color red instead of the word <code>red</code>. For example <code>body { color&#58; #FF0000; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3493,11 +3574,11 @@
       "description": [
         "Remember that <code>hex code</code> follows the red-green-blue, or <code>rgb</code> format. The first two digits of hex code represent the amount of red in the color. The third and fourth digit represent the amount of green. The fifth and sixth represent the amount of blue.",
         "So to get the absolute brightest green, you would just use <code>F</code> for the third and fourth digits (the highest possible value) and <code>0</code> for all the other digits (the lowest possible value).",
-        "Make the <code>body</code> element's background color green by giving it the hex code value of <code>#00FF00</code>."
+        "Make the <code>body</code> element's background color green by giving it the hex code value of <code>#00FF00</code>"
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(0, 255, 0)\", 'Give your <code>body</code> element the <code>background-color</code> of <code>green</code>.')",
-        "assert(editor.match(/#00FF00/ig) && editor.match(/#00FF00/ig).length > 0, 'Use the <code>hex code</code> for the color green instead of the word <code>green</code>. For example <code>body { color&#58; #00FF00; }</code>.')"
+        "assert(editor.match(/#00FF00/ig) && editor.match(/#00FF00/ig).length > 0, 'Use the <code>hex code</code> for the color green instead of the word <code>green</code>. For example <code>body { color&#58; #00FF00; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3527,11 +3608,11 @@
       "description": [
         "Hex code follows the red-green-blue, or <code>rgb</code> format. The first two digits of hex code represent the amount of red in the color. The third and fourth digit represent the amount of green. The fifth and sixth represent the amount of blue.",
         "So to get the absolute brightest blue, we use <code>F</code> for the fifth and sixth digits (the highest possible value) and <code>0</code> for all the other digits (the lowest possible value).",
-        "Make the <code>body</code> element's background color blue by giving it the hex code value of <code>#0000FF</code>."
+        "Make the <code>body</code> element's background color blue by giving it the hex code value of <code>#0000FF</code>"
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 255)\", 'Give your <code>body</code> element the <code>background-color</code> of blue.')",
-        "assert(editor.match(/#0000FF/ig) && editor.match(/#0000FF/ig).length > 0, 'Use the <code>hex code</code> for the color blue instead of the word <code>blue</code>. For example <code>body { color&#58; #0000FF; }</code>.')"
+        "assert(editor.match(/#0000FF/ig) && editor.match(/#0000FF/ig).length > 0, 'Use the <code>hex code</code> for the color blue instead of the word <code>blue</code>. For example <code>body { color&#58; #0000FF; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3561,11 +3642,11 @@
       "description": [
         "From these three pure colors (red, green and blue), we can create 16 million other colors.",
         "For example, orange is pure red, mixed with some green, and no blue.",
-        "Make the <code>body</code> element's background color orange by giving it the hex code value of <code>#FFA500</code>."
+        "Make the <code>body</code> element's background color orange by giving it the hex code value of <code>#FFA500</code>"
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(255, 165, 0)\", 'Give your <code>body</code> element the <code>background-color</code> of orange.')",
-        "assert(editor.match(/#FFA500/ig) && editor.match(/#FFA500/ig).length > 0, 'Use the <code>hex code</code> for the color orange instead of the word <code>orange</code>. For example <code>body { color&#58; #FFA500; }</code>.')"
+        "assert(editor.match(/#FFA500/ig) && editor.match(/#FFA500/ig).length > 0, 'Use the <code>hex code</code> for the color orange instead of the word <code>orange</code>. For example <code>body { color&#58; #FFA500; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3595,11 +3676,11 @@
       "description": [
         "From these three pure colors (red, green and blue), we can create 16 million other colors.",
         "We can also create different shades of gray by evenly mixing all three colors.",
-        "Make the <code>body</code> element's background color gray by giving it the hex code value of <code>#808080</code>."
+        "Make the <code>body</code> element's background color gray by giving it the hex code value of <code>#808080</code>"
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(128, 128, 128)\", 'Give your <code>body</code> element the <code>background-color</code> of gray.')",
-        "assert(editor.match(/#808080/g) && editor.match(/#808080/g).length > 0, 'Use the <code>hex code</code> the color gray instead of the word <code>gray</code>. For example <code>body { color&#58; #808080; }</code>.')"
+        "assert(editor.match(/#808080/g) && editor.match(/#808080/g).length > 0, 'Use the <code>hex code</code> the color gray instead of the word <code>gray</code>. For example <code>body { color&#58; #808080; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3628,11 +3709,11 @@
       "title": "Use Hex Code for Specific Shades of Gray",
       "description": [
         "We can also create other shades of gray by evenly mixing all three colors. We can go very close to true black.",
-        "Make the <code>body</code> element's background color a dark gray by giving it the hex code value of <code>#111111</code>."
+        "Make the <code>body</code> element's background color a dark gray by giving it the hex code value of <code>#111111</code>"
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(17, 17, 17)\", 'Give your <code>body</code> element the <code>background-color</code> of a dark gray.')",
-        "assert(editor.match(/#111111/g) && editor.match(/#111111/g).length > 0, 'Use <code>hex code</code> to make a dark gray. For example <code>body { color&#58; #111111; }</code>.')"
+        "assert(editor.match(/#111111/g) && editor.match(/#111111/g).length > 0, 'Use <code>hex code</code> to make a dark gray. For example <code>body { color&#58; #111111; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3667,7 +3748,7 @@
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(255, 0, 0)\", 'Give your <code>body</code> element the <code>background-color</code> of red.')",
-        "assert(editor.match(/#F00/ig) && editor.match(/#F00/ig).length > 0, 'Use <code>abbreviated hex code</code> instead of a six-character <code>hex code</code>. For example <code>body { color&#58; #F00; }</code>.')"
+        "assert(editor.match(/#F00/ig) && editor.match(/#F00/ig).length > 0, 'Use <code>abbreviated hex code</code> instead of a six-character <code>hex code</code>. For example <code>body { color&#58; #F00; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3696,14 +3777,17 @@
       "title": "Use RGB values to Color Elements",
       "description": [
         "Another way you can represent colors in CSS is by using <code>rgb</code> values.",
-        "RGB values look like this: <code>rgb(0, 0, 0)</code> for black and <code>rgb(255, 255, 255)</code> for white.",
+        "The RGB value for black looks like this:",
+        "<code>rgb(0, 0, 0)</code>",
+        "The RGB value for white looks like this:",
+        "<code>rgb(255, 255, 255)</code>",
         "Instead of using six hexadecimal digits like you do with hex code, with <code>rgb</code> you specify the brightness of each color with a number between 0 and 255.",
         "If you do the math, 16 times 16 is 256 total values. So <code>rgb</code>, which starts counting from zero, has the exact same number of possible values as hex code.",
         "Let's replace the hex code in our <code>body</code> element's background color with the RGB value for black: <code>rgb(0, 0, 0)</code>"
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 0)\", 'Your <code>body</code> element should have a black background.')",
-        "assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*0\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of black. For example <code>body { color&#58; rgb&#40;0&#44; 0&#44; 0&#41;; }</code>.')"
+        "assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*0\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of black. For example <code>body { color&#58; rgb&#40;0&#44; 0&#44; 0&#41;; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3731,13 +3815,16 @@
       "id": "bad88fee1348bd9aedf08726",
       "title": "Use RGB to Color Elements White",
       "description": [
-        "RGB values look like this: <code>rgb(0, 0, 0)</code> for black and <code>rgb(255, 255, 255)</code> for white.",
+        "The RGB value for black looks like this:",
+        "<code>rgb(0, 0, 0)</code>",
+        "The RGB value for white looks like this:",
+        "<code>rgb(255, 255, 255)</code>",
         "Instead of using six hexadecimal digits like you do with hex code, with <code>rgb</code> you specify the brightness of each color with a number between 0 and 255.",
         "Change the <code>body</code> element's background color from the RGB value for black to the <code>rgb</code> value for white: <code>rgb(255, 255, 255)</code>"
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(255, 255, 255)\", 'Your <code>body</code> should have a white background.')",
-        "assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*255\\s*,\\s*255\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of white. For example <code>body { background-color&#58; rgb&#40;255&#44; 255 &#44; 255&#41;; }</code>.')"
+        "assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*255\\s*,\\s*255\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of white. For example <code>body { background-color&#58; rgb&#40;255&#44; 255 &#44; 255&#41;; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3771,7 +3858,7 @@
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(255, 0, 0)\", 'Your <code>body</code> should have a red background.')",
-        "assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*0\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of red. For example <code>body { background-color&#58; rgb&#40;255&#44; 0&#44; 0&#41;; }</code>.')"
+        "assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*0\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of red. For example <code>body { background-color&#58; rgb&#40;255&#44; 0&#44; 0&#41;; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3803,7 +3890,7 @@
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(0, 255, 0)\", 'Your <code>body</code> element should have a green background.')",
-        "assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*255\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of green. For example <code>body { background-color&#58; rgb&#40;0&#44; 255&#44; 0&#41;; }</code>.')"
+        "assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*255\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of green. For example <code>body { background-color&#58; rgb&#40;0&#44; 255&#44; 0&#41;; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3835,7 +3922,7 @@
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(0, 0, 255)\", 'Your <code>body</code> element should have a blue background.')",
-        "assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*0\\s*,\\s*255\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of blue. For example <code>body { background-color&#58; rgb&#40;0&#44; 0&#44; 255&#41;; }</code>.')"
+        "assert(editor.match(/rgb\\s*\\(\\s*0\\s*,\\s*0\\s*,\\s*255\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of blue. For example <code>body { background-color&#58; rgb&#40;0&#44; 0&#44; 255&#41;; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3868,7 +3955,7 @@
       ],
       "tests": [
         "assert($(\"body\").css(\"background-color\") === \"rgb(255, 165, 0)\", 'Your <code>body</code> element should have an orange background.')",
-        "assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*165\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of orange. For example <code>body { background-color&#58; rgb&#40;255&#44; 165&#44; 0&#41;; }</code>.')"
+        "assert(editor.match(/rgb\\s*\\(\\s*255\\s*,\\s*165\\s*,\\s*0\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of orange. For example <code>body { background-color&#58; rgb&#40;255&#44; 165&#44; 0&#41;; }</code>')"
       ],
       "challengeSeed": [
         "<style>",
@@ -3891,39 +3978,6 @@
       "descriptionPt": [],
       "nameDe": "",
       "descriptionDe": []
-    },
-    {
-      "id": "bad83fee1348bd9aede08720",
-      "title": "Use RGB to Color Elements Gray",
-      "description": [
-        "With RGB values, we can make an element gray by using combinations of the same value for all three colors.",
-        "Change the <code>body</code> element's background color to the RGB value for gray: <code>rgb(128, 128, 128)</code>"
-      ],
-      "tests": [
-        "assert($(\"body\").css(\"background-color\") === \"rgb(128, 128, 128)\", 'Your <code>body</code> element should have a gray background.')",
-        "assert(editor.match(/rgb\\s*\\(\\s*128\\s*,\\s*128\\s*,\\s*128\\s*\\)/ig), 'Use <code>rgb</code> to give your <code>body</code> element the <code>background-color</code> of gray. For example <code>body { background-color&#58; rgb&#40;128&#44; 128&#44; 128&#41;; }</code>.')"
-      ],
-      "challengeSeed": [
-        "<style>",
-        "  body {",
-        "    background-color: rgb(255, 165, 0);",
-        "  }",
-        "</style>"
-      ],
-      "type": "waypoint",
-      "challengeType": 0,
-      "nameCn": "",
-      "descriptionCn": [],
-      "nameFr": "",
-      "descriptionFr": [],
-      "nameRu": "",
-      "descriptionRu": [],
-      "nameEs": "",
-      "descriptionEs": [],
-      "namePt": "",
-      "descriptionPt": [],
-      "nameDe": "",
-      "descriptionDe": []
     }
   ]
 }
diff --git a/seed/challenges/intermediate-bonfires.json b/seed/challenges/intermediate-bonfires.json
index 248382e6f3..9ae783a1a5 100644
--- a/seed/challenges/intermediate-bonfires.json
+++ b/seed/challenges/intermediate-bonfires.json
@@ -30,6 +30,9 @@
         "Math.min()",
         "Array.reduce()"
       ],
+      "solutions": [
+        "function sumAll(arr) {\n  var sum = 0;\n  arr.sort(function(a,b) {return a-b;});\n  for (var i = arr[0]; i <= arr[1]; i++) {\n    sum += i; \n  }\n  return sum;\n}\n\nsumAll([1, 4]);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -67,8 +70,7 @@
         "assert.deepEqual(diff([1, 2, 3, 5], [1, 2, 3, 4, 5]), [4], 'message: <code>[1, 2, 3, 5], [1, 2, 3, 4, 5]</code> should return <code>[4]</code>.');",
         "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4]), [\"piglet\", 4], 'message: <code>[1, \"calf\", 3, \"piglet\"], [1, \"calf\", 3, 4]</code> should return <code>[\"piglet\", 4]</code>.');",
         "assert.deepEqual(diff([], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]), [\"snuffleupagus\", \"cookie monster\", \"elmo\"], 'message: <code>[], [\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code> should return <code>[\"snuffleupagus\", \"cookie monster\", \"elmo\"]</code>.');",
-        "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [7, \"filly\"]), [1, \"calf\", 3, \"piglet\", 7, \"filly\"], 'message: <code>[1, \"calf\", 3, \"piglet\"], [7, \"filly\"]</code> should return <code>[1, \"calf\", 3, \"piglet\", 7, \"filly\"]</code>.');",
-        "assert.deepEqual(diff([1, 2, 3, 3], [1]), [2, 3], 'message: <code>[1, 2, 3, 3], [1]</code> should return <code>[2, 3]</code>.');"
+        "assert.includeMembers(diff([1, \"calf\", 3, \"piglet\"], [7, \"filly\"]), [1, \"calf\", 3, \"piglet\", 7, \"filly\"], 'message: <code>[1, \"calf\", 3, \"piglet\"], [7, \"filly\"]</code> should return <code>[1, \"calf\", 3, \"piglet\", 7, \"filly\"]</code>.');"
       ],
       "MDNlinks": [
         "Comparison Operators",
@@ -77,6 +79,9 @@
         "Array.indexOf()",
         "Array.concat()"
       ],
+      "solutions": [
+        "function diff(arr1, arr2) {\n  var newArr = [];\n  var h1 = Object.create(null);\n  arr1.forEach(function(e) {\n    h1[e] = e;\n  });\n  \n  var h2 = Object.create(null);\n  arr2.forEach(function(e) {\n    h2[e] = e;\n  });\n  \n  Object.keys(h1).forEach(function(e) {\n     if (!(e in h2)) newArr.push(h1[e]);\n  });\n  Object.keys(h2).forEach(function(e) {\n     if (!(e in h1)) newArr.push(h2[e]);\n  });\n  // Same, same; but different.\n  return newArr;\n}\n\ndiff([1, 2, 3, 5], [1, 2, 3, 4, 5]);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -94,11 +99,25 @@
       "id": "a7f4d8f2483413a6ce226cac",
       "title": "Roman Numeral Converter",
       "tests": [
-        "assert.deepEqual(convert(12), \"XII\", 'message: <code>convert(12)</code> should return \"XII\".');",
         "assert.deepEqual(convert(5), \"V\", 'message: <code>convert(5)</code> should return \"V\".');",
         "assert.deepEqual(convert(9), \"IX\", 'message: <code>convert(9)</code> should return \"IX\".');",
+        "assert.deepEqual(convert(12), \"XII\", 'message: <code>convert(12)</code> should return \"XII\".');",
+        "assert.deepEqual(convert(16), \"XVI\", 'message: <code>convert(16)</code> should return \"XVI\".');",
         "assert.deepEqual(convert(29), \"XXIX\", 'message: <code>convert(29)</code> should return \"XXIX\".');",
-        "assert.deepEqual(convert(16), \"XVI\", 'message: <code>convert(16)</code> should return \"XVI\".');"
+        "assert.deepEqual(convert(44), \"XLIV\", 'message: <code>convert(44)</code> should return \"XLIV\".');",
+        "assert.deepEqual(convert(45), \"XLV\", '<code>convert(45)</code> should return \"XLV\"');",
+        "assert.deepEqual(convert(68), \"LXVIII\", '<code>convert(68)</code> should return \"LXVIII\"');",
+        "assert.deepEqual(convert(83), \"LXXXIII\", '<code>convert(83)</code> should return \"LXXXIII\"');",
+        "assert.deepEqual(convert(97), \"XCVII\", '<code>convert(97)</code> should return \"XCVII\"');",
+        "assert.deepEqual(convert(99), \"XCIX\", '<code>convert(99)</code> should return \"XCIX\"');",
+        "assert.deepEqual(convert(500), \"D\", '<code>convert(500)</code> should return \"D\"');",
+        "assert.deepEqual(convert(501), \"DI\", '<code>convert(501)</code> should return \"DI\"');",
+        "assert.deepEqual(convert(649), \"DCXLIX\", '<code>convert(649)</code> should return \"DCXLIX\"');",
+        "assert.deepEqual(convert(798), \"DCCXCVIII\", '<code>convert(798)</code> should return \"DCCXCVIII\"');",
+        "assert.deepEqual(convert(891), \"DCCCXCI\", '<code>convert(891)</code> should return \"DCCCXCI\"');",
+        "assert.deepEqual(convert(1000), \"M\", '<code>convert(1000)</code> should return \"M\"');",
+        "assert.deepEqual(convert(1004), \"MIV\", '<code>convert(1004)</code> should return \"MIV\"');",
+        "assert.deepEqual(convert(1006), \"MVI\", '<code>convert(1006)</code> should return \"MVI\"');"
       ],
       "description": [
         "Convert the given number into a roman numeral.",
@@ -118,6 +137,9 @@
         "Array.indexOf()",
         "Array.join()"
       ],
+      "solutions": [
+        "function convert(num) {\n  var ref = [['M', 1000], ['CM', 900], ['D', 500], ['CD', 400], ['C', 100], ['XC', 90], ['L', 50], ['XL', 40], ['X', 10], ['IX', 9], ['V', 5], ['IV', 4], ['I', 1]];\n  var res = [];\n  ref.forEach(function(p) {\n    while (num >= p[1]) {\n      res.push(p[0]);\n      num -= p[1];\n    }\n  });\n  return res.join('');\n}\n\nconvert(36);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -149,7 +171,7 @@
         "where([{ first: \"Romeo\", last: \"Montague\" }, { first: \"Mercutio\", last: null }, { first: \"Tybalt\", last: \"Capulet\" }], { last: \"Capulet\" });"
       ],
       "tests": [
-        "assert.deepEqual(where([{ first: \"Romeo\", last: \"Montague\" }, { first: \"Mercutio\", last: null }, { first: \"Tybalt\", last: \"Capulet\" }], { last: \"Capulet\" }), [{ first: \"Tybalt\", last: \"Capulet\" }], 'message: <code>where()</code> should return an array of objects.');",
+        "assert.deepEqual(where([{ first: \"Romeo\", last: \"Montague\" }, { first: \"Mercutio\", last: null }, { first: \"Tybalt\", last: \"Capulet\" }], { last: \"Capulet\" }), [{ first: \"Tybalt\", last: \"Capulet\" }], 'message: <code>where([{ first: \"Romeo\", last: \"Montague\" }, { first: \"Mercutio\", last: null }, { first: \"Tybalt\", last: \"Capulet\" }], { last: \"Capulet\" })</code> should return <code>[{ first: \"Tybalt\", last: \"Capulet\" }]</code>.');",
         "assert.deepEqual(where([{ \"a\": 1 }, { \"a\": 1 }, { \"a\": 1, \"b\": 2 }], { \"a\": 1 }), [{ \"a\": 1 }, { \"a\": 1 }, { \"a\": 1, \"b\": 2 }], 'message: <code>where([{ \"a\": 1 }, { \"a\": 1 }, { \"a\": 1, \"b\": 2 }], { \"a\": 1 })</code> should return <code>[{ \"a\": 1 }, { \"a\": 1 }, { \"a\": 1, \"b\": 2 }]</code>.');",
         "assert.deepEqual(where([{ \"a\": 1, \"b\": 2 }, { \"a\": 1 }, { \"a\": 1, \"b\": 2, \"c\": 2 }], { \"a\": 1, \"b\": 2 }), [{ \"a\": 1, \"b\": 2 }, { \"a\": 1, \"b\": 2, \"c\": 2 }], 'message: <code>where([{ \"a\": 1, \"b\": 2 }, { \"a\": 1 }, { \"a\": 1, \"b\": 2, \"c\": 2 }], { \"a\": 1, \"b\": 2 })</code> should return <code>[{ \"a\": 1, \"b\": 2 }, { \"a\": 1, \"b\": 2, \"c\": 2 }]</code>.');"
       ],
@@ -158,6 +180,9 @@
         "Object.hasOwnProperty()",
         "Object.keys()"
       ],
+      "solutions": [
+        "function where(collection, source) {\n  var arr = [];\n  var keys = Object.keys(source);\n  collection.forEach(function(e) {\n    if(keys.every(function(key) {return e[key] === source[key];})) {\n      arr.push(e);  \n    }\n  });\n  return arr;\n}\n\nwhere([{ first: 'Romeo', last: 'Montague' }, { first: 'Mercutio', last: null }, { first: 'Tybalt', last: 'Capulet' }], { last: 'Capulet' });\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -177,7 +202,7 @@
       "tests": [
         "assert.deepEqual(myReplace(\"Let us go to the store\", \"store\", \"mall\"), \"Let us go to the mall\", 'message: <code>myReplace(\"Let us go to the store\", \"store\", \"mall\")</code> should return \"Let us go to the mall\".');",
         "assert.deepEqual(myReplace(\"He is Sleeping on the couch\", \"Sleeping\", \"sitting\"), \"He is Sitting on the couch\", 'message: <code>myReplace(\"He is Sleeping on the couch\", \"Sleeping\", \"sitting\")</code> should return \"He is Sitting on the couch\".');",
-        "assert.deepEqual(myReplace(\"This has a spellngi error\", \"spellngi\", \"spelling\"), \"This has a spelling error\", 'message: <code>myReplace(\"This has a spellngi error\", \"spellingi\", \"spelling\")</code> should return \"This has a spelling error\".');",
+        "assert.deepEqual(myReplace(\"This has a spellngi error\", \"spellngi\", \"spelling\"), \"This has a spelling error\", 'message: <code>myReplace(\"This has a spellngi error\", \"spellngi\", \"spelling\")</code> should return \"This has a spelling error\".');",
         "assert.deepEqual(myReplace(\"His name is Tom\", \"Tom\", \"john\"), \"His name is John\", 'message: <code>myReplace(\"His name is Tom\", \"Tom\", \"john\")</code> should return \"His name is John\".');",
         "assert.deepEqual(myReplace(\"Let us get back to more Coding\", \"Coding\", \"bonfires\"), \"Let us get back to more Bonfires\", 'message: <code>myReplace(\"Let us get back to more Coding\", \"Coding\", \"bonfires\")</code> should return \"Let us get back to more Bonfires\".');"
       ],
@@ -201,6 +226,9 @@
         "String.replace()",
         "Array.join()"
       ],
+      "solutions": [
+        "function replace(str, before, after) {\n  if (before.charAt(0) === before.charAt(0).toUpperCase()) {\n    after = after.charAt(0).toUpperCase() + after.substring(1);\n  } else {\n    after = after.charAt(0).toLowerCase() + after.substring(1);\n  }\n  return str.replace(before, after);\n}\n\nreplace(\"A quick brown fox jumped over the lazy dog\", \"jumped\", \"leaped\");\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -244,6 +272,9 @@
         "String.substr()",
         "String.split()"
       ],
+      "solutions": [
+        "function translate(str) {\n  if (isVowel(str.charAt(0))) return str + \"way\";\n  var front = [];\n  str = str.split('');\n  while (str.length && !isVowel(str[0])) {\n    front.push(str.shift());\n  }\n  return [].concat(str, front).join('') + 'ay';\n}\n\nfunction isVowel(c) {\n  return ['a', 'e', 'i', 'o', 'u'].indexOf(c.toLowerCase()) !== -1;\n}\n\ntranslate(\"consonant\");\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -284,6 +315,9 @@
         "Array.push()",
         "String.split()"
       ],
+      "solutions": [
+        "var lookup = Object.create(null);\nlookup.A = 'T';\nlookup.T = 'A';\nlookup.C = 'G';\nlookup.G = 'C';\n\nfunction pair(str) {\n return str.split('').map(function(p) {return [p, lookup[p]];});\n}\n\npair(\"GCG\");\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -322,6 +356,9 @@
         "String.charCodeAt()",
         "String.fromCharCode()"
       ],
+      "solutions": [
+        "function fearNotLetter(str) {\n  var s = str.split('').map(function(c) {return c.charCodeAt(0);});\n  for (var i = 1; i < s.length; i++) {\n    if (s[i]-1 != s[i-1]) {\n      return String.fromCharCode(s[i]-1);\n    }\n  }\n}\n\nfearNotLetter('abce');\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -364,6 +401,9 @@
       "MDNlinks": [
         "Boolean Objects"
       ],
+      "solutions": [
+        "function boo(bool) {\n  // What is the new fad diet for ghost developers? The Boolean.\n  return typeof(bool) === \"boolean\";\n}\n\nboo(null);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -404,6 +444,9 @@
         "Arguments object",
         "Array.reduce()"
       ],
+      "solutions": [
+        "function unite(arr1, arr2, arr3) {\n  return [].slice.call(arguments).reduce(function(a, b) {\n    return [].concat(a, b.filter(function(e) {return a.indexOf(e) === -1;}));\n  }, []);\n}\n\nunite([1, 2, 3], [5, 2, 1, 4], [2, 1]);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -445,6 +488,9 @@
         "RegExp",
         "HTML Entities"
       ],
+      "solutions": [
+        "var MAP = { '&': '&amp;',\n            '<': '&lt;',\n            '>': '&gt;',\n            '\"': '&quot;',\n            \"'\": '&apos;'};\n\nfunction convert(str) {\n  return str.replace(/[&<>\"']/g, function(c) {\n    return MAP[c];\n  });\n}\n\nconvert('Dolce & Gabbana');\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -484,6 +530,9 @@
         "RegExp",
         "String.replace()"
       ],
+      "solutions": [
+        "function spinalCase(str) {\n  // \"It's such a fine line between stupid, and clever.\"\n  // --David St. Hubbins\n  str = str.replace(/([a-z](?=[A-Z]))/g, '$1 ');\n  return str.toLowerCase().replace(/\\ |\\_/g, '-');\n}\n\nspinalCase('This Is Spinal Tap');\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -524,6 +573,9 @@
       "MDNlinks": [
         "Remainder"
       ],
+      "solutions": [
+        "function sumFibs(num) {\n  var a = 1; \n  var b = 1;\n  var s = 0;\n  while (a <= num) {\n    if (a % 2 !== 0) {   \n      s += a; \n    }\n    a = [b, b=b+a][0];\n  }\n  return s;\n}\n\nsumFibs(4);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -562,6 +614,9 @@
         "For Loops",
         "Array.push()"
       ],
+      "solutions": [
+        "function eratosthenesArray(n) {\n    var primes = [];\n    if (n > 2) {\n        var half = n>>1;\n        var sieve = Array(half);\n        for (var i = 1, limit = Math.sqrt(n)>>1; i <= limit; i++) {\n            if (!sieve[i]) {\n                for (var step = 2*i+1, j = (step*step)>>1; j < half; j+=step) {\n                    sieve[j] = true;\n                }\n            }\n        }\n        primes.push(2);\n        for (var p = 1; p < half; p++) {\n            if (!sieve[p]) primes.push(2*p+1);\n        }\n    }\n    return primes;\n}\n\nfunction sumPrimes(num) {\n  return eratosthenesArray(num+1).reduce(function(a,b) {return a+b;}, 0);\n}\n\nsumPrimes(10);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -601,6 +656,9 @@
       "MDNlinks": [
         "Smallest Common Multiple"
       ],
+      "solutions": [
+        "function gcd(a, b) {\n    while (b !== 0) {\n        a = [b, b = a % b][0];\n    }\n    return a;\n}\n\nfunction lcm(a, b) {\n    return (a * b) / gcd(a, b);\n}\n\nfunction smallestCommons(arr) {\n  arr.sort(function(a,b) {return a-b;});\n  var rng = [];\n  for (var i = arr[0]; i <= arr[1]; i++) {\n    rng.push(i);\n  }\n  return rng.reduce(lcm);\n}\n\n\nsmallestCommons([1,5]);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -634,7 +692,10 @@
         "assert.strictEqual(find([1, 3, 5, 9], function(num) { return num % 2 === 0; }), undefined, 'message: <code>find([1, 3, 5, 9], function(num) { return num % 2 === 0; })</code> should return undefined.');"
       ],
       "MDNlinks": [
-        "Array.some()"
+        "Array.filter()"
+      ],
+      "solutions": [
+        "function find(arr, func) {\n  var num;\n  arr.some(function(e) {\n    if (func(e)) {\n      num = e;\n      return true;\n    }\n  });\n  return num;\n}\n\nfind([1, 2, 3, 4], function(num){ return num % 2 === 0; });\n"
       ],
       "type": "bonfire",
       "challengeType": 5,
@@ -665,15 +726,18 @@
         "drop([1, 2, 3], function(n) {return n < 3; });"
       ],
       "tests": [
-        "assert.deepEqual(drop([1, 2, 3, 4], function(n) {return n>= 3;}), [3, 4], 'message: <code>drop([1, 2, 3, 4], function(n) {return n>= 3;})</code> should return <code>[3, 4]</code>.');",
+        "assert.deepEqual(drop([1, 2, 3, 4], function(n) {return n>= 3;}), [3, 4], 'message: <code>drop([1, 2, 3, 4], function(n) {return n >= 3;})</code> should return <code>[3, 4]</code>.');",
         "assert.deepEqual(drop([1, 2, 3], function(n) {return n > 0; }), [1, 2, 3], 'message: <code>drop([1, 2, 3], function(n) {return n > 0; })</code> should return <code>[1, 2, 3]</code>.');",
         "assert.deepEqual(drop([1, 2, 3, 4], function(n) {return n > 5;}), [], 'message: <code>drop([1, 2, 3, 4], function(n) {return n > 5;})</code> should return <code>[]</code>.');",
-        "assert.deepEqual(drop([1, 2, 3, 7, 4], function(n) {return n > 3}), [7, 4], 'message: <code>drop([1, 2, 3, 7, 4], function(n) {return n>= 3})</code> should return <code>[7, 4]</code>.');"
+        "assert.deepEqual(drop([1, 2, 3, 7, 4], function(n) {return n > 3}), [7, 4], 'message: <code>drop([1, 2, 3, 7, 4], function(n) {return n > 3})</code> should return <code>[7, 4]</code>.');"
       ],
       "MDNlinks": [
         "Arguments object",
         "Array.shift()"
       ],
+      "solutions": [
+        "(function drop(arr, func) {\n  // Drop them elements.\n  while (arr.length && !func(arr[0])) {\n    arr.shift();\n  }\n  return arr;\n}\n\ndrop([1, 2, 3], function(n) {return n < 3; });\n)"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -711,6 +775,9 @@
       "MDNlinks": [
         "Array.isArray()"
       ],
+      "solutions": [
+        "function steamroller(arr) {\n  if (!Array.isArray(arr)) {\n    return [arr];\n  }\n  var out = [];\n  arr.forEach(function(e) {\n    steamroller(e).forEach(function(v) {\n      out.push(v);\n    });\n  });\n  return out;\n}\n\nsteamroller([1, [2], [3, [[4]]]]);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -747,6 +814,9 @@
         "String.charCodeAt()",
         "String.fromCharCode()"
       ],
+      "solutions": [
+        "function binaryAgent(str) {\n  return str.split(' ').map(function(s) { return parseInt(s, 2); }).map(function(b) { return String.fromCharCode(b);}).join('');\n}\n\nbinaryAgent('01000001 01110010 01100101 01101110 00100111 01110100 00100000 01100010 01101111 01101110 01100110 01101001 01110010 01100101 01110011 00100000 01100110 01110101 01101110 00100001 00111111');\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -764,14 +834,13 @@
       "id": "a10d2431ad0c6a099a4b8b52",
       "title": "Everything Be True",
       "description": [
-        "Check if the predicate (second argument) returns truthy (defined) for all elements of a collection (first argument).",
-        "For this, check to see if the property defined in the second argument is present on every element of the collection.",
+        "Check if the predicate (second argument) is truthy on all elements of a collection (first argument).",
         "Remember, you can access object properties through either dot notation or [] notation.",
         "Remember to use <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck' target='_blank'>Read-Search-Ask</a> if you get stuck. Try to pair program. Write your own code."
       ],
       "challengeSeed": [
         "function every(collection, pre) {",
-        "  // Does everyone have one of these?",
+        "  // Is everyone being true?",
         "  return pre;",
         "}",
         "",
@@ -779,12 +848,17 @@
       ],
       "tests": [
         "assert.strictEqual(every([{\"user\": \"Tinky-Winky\", \"sex\": \"male\"}, {\"user\": \"Dipsy\", \"sex\": \"male\"}, {\"user\": \"Laa-Laa\", \"sex\": \"female\"}, {\"user\": \"Po\", \"sex\": \"female\"}], \"sex\"), true, 'message: <code>every([{\"user\": \"Tinky-Winky\", \"sex\": \"male\"}, {\"user\": \"Dipsy\", \"sex\": \"male\"}, {\"user\": \"Laa-Laa\", \"sex\": \"female\"}, {\"user\": \"Po\", \"sex\": \"female\"}], \"sex\")</code> should return true.');",
-        "assert.strictEqual(every([{\"user\": \"Tinky-Winky\", \"sex\": \"male\"}, {\"user\": \"Dipsy\", \"sex\": \"male\"}, {\"user\": \"Laa-Laa\", \"sex\": \"female\"}, {\"user\": \"Po\", \"sex\": \"female\"}], {\"sex\": \"female\"}), false, 'message: <code>every([{\"user\": \"Tinky-Winky\", \"sex\": \"male\"}, {\"user\": \"Dipsy\", \"sex\": \"male\"}, {\"user\": \"Laa-Laa\", \"sex\": \"female\"}, {\"user\": \"Po\", \"sex\": \"female\"}], {\"sex\": \"female\"})</code> should return false.');",
-        "assert.strictEqual(every([{\"user\": \"Tinky-Winky\", \"sex\": \"female\"}, {\"user\": \"Dipsy\", \"sex\": \"male\"}, {\"user\": \"Laa-Laa\", \"sex\": \"female\"}, {\"user\": \"Po\", \"sex\": \"female\"}], {\"sex\": \"female\"}), false, 'message: <code>every([{\"user\": \"Tinky-Winky\", \"sex\": \"female\"}, {\"user\": \"Dipsy\", \"sex\": \"male\"}, {\"user\": \"Laa-Laa\", \"sex\": \"female\"}, {\"user\": \"Po\", \"sex\": \"female\"}], {\"sex\": \"female\"})</code> should return false.');"
+        "assert.strictEqual(every([{\"user\": \"Tinky-Winky\", \"sex\": \"male\"}, {\"user\": \"Dipsy\"}, {\"user\": \"Laa-Laa\", \"sex\": \"female\"}, {\"user\": \"Po\", \"sex\": \"female\"}], \"sex\"), false, 'message: <code>every([{\"user\": \"Tinky-Winky\", \"sex\": \"male\"}, {\"user\": \"Dipsy\"}, {\"user\": \"Laa-Laa\", \"sex\": \"female\"}, {\"user\": \"Po\", \"sex\": \"female\"}], \"sex\")</code> should return false.');",
+        "assert.strictEqual(every([{\"user\": \"Tinky-Winky\", \"sex\": \"male\", \"age\": 2}, {\"user\": \"Dipsy\", \"sex\": \"male\", \"age\": 0}, {\"user\": \"Laa-Laa\", \"sex\": \"female\", \"age\": 5}, {\"user\": \"Po\", \"sex\": \"female\", \"age\": 4}], \"age\"), false, 'message: <code>every([{\"user\": \"Tinky-Winky\", \"sex\": \"male\", \"age\": 0}, {\"user\": \"Dipsy\", \"sex\": \"male\", \"age\": 3}, {\"user\": \"Laa-Laa\", \"sex\": \"female\", \"age\": 5}, {\"user\": \"Po\", \"sex\": \"female\", \"age\": 4}], \"age\")</code> should return false.');",
+        "assert.strictEqual(every([{\"name\": \"Pete\", \"onBoat\": true}, {\"name\": \"Repeat\", \"onBoat\": true}, {\"name\": \"FastFoward\", \"onBoat\": null}], \"onBoat\"), false, 'message: <code>every([{\"name\": \"Pete\", \"onBoat\": true}, {\"name\": \"Repeat\", \"onBoat\": true}, {\"name\": \"FastFoward\", \"onBoat\": null}], \"onBoat\")</code> should return false');",
+        "assert.strictEqual(every([{\"name\": \"Pete\", \"onBoat\": true}, {\"name\": \"Repeat\", \"onBoat\": true, \"alias\": \"Repete\"}, {\"name\": \"FastFoward\", \"onBoat\": true}], \"onBoat\"), true, 'message: <code>every([{\"name\": \"Pete\", \"onBoat\": true}, {\"name\": \"Repeat\", \"onBoat\": true, \"alias\": \"Repete\"}, {\"name\": \"FastFoward\", \"onBoat\": true}], \"onBoat\")</code> should return true');",
+        "assert.strictEqual(every([{\"single\": \"yes\"}], \"single\"), true, 'message: <code>every([{\"single\": \"yes\"}], \"single\")</code> should return true');",
+        "assert.strictEqual(every([{\"single\": \"\"}, {\"single\": \"double\"}], \"single\"), false, 'message: <code>every([{\"single\": \"\"}, {\"single\": \"double\"}], \"single\")</code> should return false');",
+        "assert.strictEqual(every([{\"single\": \"double\"}, {\"single\": undefined}], \"single\"), false, 'message: <code>every([{\"single\": \"double\"}, {\"single\": undefined}], \"single\")</code> should return false');",
+        "assert.strictEqual(every([{\"single\": \"double\"}, {\"single\": NaN}], \"single\"), false, 'message: <code>every([{\"single\": \"double\"}, {\"single\": NaN}], \"single\")</code> should return false');"
       ],
-      "MDNlinks": [
-        "Object.hasOwnProperty()",
-        "Object.getOwnPropertyNames()"
+      "solutions": [
+        "function every(collection, pre) {\n  // Does everyone have one of these?\n  return collection.every(function(e) { return e[pre]; });\n}\n\nevery([{'user': 'Tinky-Winky', 'sex': 'male'}, {'user': 'Dipsy', 'sex': 'male'}, {'user': 'Laa-Laa', 'sex': 'female'}, {'user': 'Po', 'sex': 'female'}], 'sex');\n"
       ],
       "type": "bonfire",
       "challengeType": 5,
@@ -829,6 +903,10 @@
         "Closures",
         "Arguments object"
       ],
+      "solutions": [
+        "function add() {\n  if (arguments.length == 1) {\n    var a = arguments[0];\n    if (!isNumber(a)) return;\n    return function(b) {\n      if (!isNumber(b)) return;\n      return a+b;\n    };\n  }\n  if (![].slice.call(arguments).every(isNumber)) return;\n  return arguments[0] + arguments[1];\n}\n  \nfunction isNumber(obj) {\n    return toString.call(obj) == '[object Number]';\n}\n\nadd(2,3);\n",
+        "function add() {\n  var a = arguments[0];\n  if (toString.call(a) !== '[object Number]') return;  \n  if (arguments.length === 1) {\n    return function(b) {\n      if (toString.call(b) !== '[object Number]') return;\n      return a + b;\n    };\n  }\n  var b = arguments[1];\n  if (toString.call(b) !== '[object Number]') return;  \n  return a + arguments[1];\n}\n\nadd(2,3);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
diff --git a/seed/challenges/intermediate-ziplines.json b/seed/challenges/intermediate-ziplines.json
index fd3ea5b5e9..0d2afbcb5c 100644
--- a/seed/challenges/intermediate-ziplines.json
+++ b/seed/challenges/intermediate-ziplines.json
@@ -8,7 +8,7 @@
       "title": "Show the Local Weather",
       "challengeSeed": ["126415127"],
       "description": [
-        "<span class='text-info'>Objective:</span> Build a <a href='http://codepen.io' target='_blank'>CodePen.io</a> app that successfully reverse-engineers this: <a href='http://codepen.io/AdventureBear/full/yNBJRj' target='_blank'>http://codepen.io/AdventureBear/full/yNBJRj</a>.",
+        "<span class='text-info'>Objective:</span> Build a <a href='http://codepen.io' target='_blank'>CodePen.io</a> app that successfully reverse-engineers this: <a href='http://codepen.io/FreeCodeCamp/pen/avqvgJ' target='_blank'>http://codepen.io/FreeCodeCamp/pen/avqvgJ</a>.",
         "<span class='text-info'>Rule #1:</span> Don't look at the example project's code on CodePen. Figure it out for yourself.",
         "<span class='text-info'>Rule #2:</span> You may use whichever libraries or APIs you need.",
         "<span class='text-info'>Rule #3:</span> Reverse engineer the example project's functionality, and also feel free to personalize it.",
@@ -17,6 +17,7 @@
         "<span class='text-info'>Bonus User Story:</span> As a user, I can see an icon depending on the weather.",
         "<span class='text-info'>Bonus User Story:</span> As a user, I see a different background image (e.g. snowy mountain, hot desert) depending on the weather.",
         "<span class='text-info'>Bonus User Story:</span> As a user, I can push a button to toggle between Fahrenheit and Celsius.",
+        "We recommend using the <a href='http://openweathermap.org/current#geo' target='_blank'>Open Weather API</a>. This will require creating a free API key. Normally you want to avoid exposing API keys on CodePen, but we haven't been able to find a keyless API for weather.",
         "Remember to use <a href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck' target='_blank'>Read-Search-Ask</a> if you get stuck.",
         "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. If you pair programmed, you should also include the Free Code Camp username of your pair.",
         "If you'd like immediate feedback on your project from fellow campers, click this button and paste in a link to your CodePen project. <br><br><a class='btn btn-primary btn-block' href='https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20PASTE_YOUR_CODEPEN_URL_HERE%20%0A%20%23LearnToCode%20%23JavaScript' target='_blank'>Click here then add your link to your tweet's text</a>"
diff --git a/seed/challenges/jquery.json b/seed/challenges/jquery.json
index d4625a85a4..37a0899018 100644
--- a/seed/challenges/jquery.json
+++ b/seed/challenges/jquery.json
@@ -16,15 +16,14 @@
         "This is important because without your <code>document ready function</code>, your code may run before your HTML is rendered, which would cause bugs."
       ],
       "tests": [
-        "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(/<\\/script\\s*>/g) && editor.match(/<script(\\sasync|\\sdefer)*(\\s(charset|src|type)\\s*=\\s*[\"\\']+[^\"\\']*[\"\\']+)*(\\sasync|\\sdefer)*\\s*>/g) && editor.match(/<\\/script\\s*>/g).length === editor.match(/<script(\\sasync|\\sdefer)*(\\s(charset|src|type)\\s*=\\s*[\"\\']+[^\"\\']*[\"\\']+)*(\\sasync|\\sdefer)*\\s*>/g).length, 'Create a <code>script</code> element making sure it is valid and has a closing tag.')",
         "assert(editor.match(/\\$\\s*?\\(\\s*?document\\)\\.ready\\s*?\\(\\s*?function\\s*?\\(\\s*?\\)\\s*?\\{/g), 'You should add <code>$&#40;document&#41;.ready&#40;function&#40;&#41; {</code> to the beginning of your <code>script</code> element.')",
-        "assert(editor.match(/\\n*?\\s*?\\}\\s*?\\);/g), 'Close your <code>$&#40;document&#41;.ready&#40;function&#40;&#41; {</code> function with <code>}&#41;;</code>.')"
+        "assert(editor.match(/\\n*?\\s*?\\}\\s*?\\);/g), 'Close your <code>$&#40;document&#41;.ready&#40;function&#40;&#41; {</code> function with <code>}&#41;;</code>')"
       ],
       "challengeSeed": [
         "",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -58,7 +57,8 @@
         "Now we have a <code>document ready function</code>.",
         "Now let's write our first jQuery statement. All jQuery functions start with a <code>$</code>, usually referred to as a <code>dollar sign operator</code>, or simply as <code>bling</code>.",
         "jQuery often selects an HTML element with a <code>selector</code>, then does something to that element.",
-        "For example, let's make all of your <code>button</code> elements bounce. Just add this code inside your document ready function: <code>$(\"button\").addClass(\"animated bounce\")</code>.",
+        "For example, let's make all of your <code>button</code> elements bounce. Just add this code inside your document ready function:",
+        "<code>$(\"button\").addClass(\"animated bounce\")</code>",
         "Note that we've already included both the jQuery library and the Animate.css library in your code editor. So you are using jQuery to apply the Animate.css <code>bounce</code> class to your <code>button</code> elements."
       ],
       "tests": [
@@ -72,7 +72,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -108,7 +108,8 @@
         "First, let's target your <code>div</code> elements with the class <code>well</code> by using the <code>$(\".well\")</code> selector.",
         "Note that, just like with CSS declarations, you type a <code>.</code> before the class's name.",
         "Then use jQuery's <code>.addClass()</code> function to add the classes <code>animated</code> and <code>shake</code>.",
-        "For example, you could make all the elements with the class <code>text-primary</code> shake by adding the following to your <code>document ready function</code>: <code>$(\".text-primary\").addClass(\"animated shake\");</code>"
+        "For example, you could make all the elements with the class <code>text-primary</code> shake by adding the following to your <code>document ready function</code>:",
+        "<code>$(\".text-primary\").addClass(\"animated shake\");</code>"
       ],
       "tests": [
         "assert($(\".well\").hasClass(\"animated\") && $(\".well\").hasClass(\"shake\"), 'Use the jQuery <code>addClass&#40&#41</code> function to give the classes <code>animated</code> and <code>shake</code> to all your elements with the class <code>well</code>.')",
@@ -121,7 +122,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -156,7 +157,8 @@
         "First target your <code>button</code> element with the id <code>target3</code> by using the <code>$(\"#target3\")</code> selector.",
         "Note that, just like with CSS declarations, you type a <code>#</code> before the id's name.",
         "Then use jQuery's <code>.addClass()</code> function to add the classes <code>animated</code> and <code>fadeOut</code>.",
-        "Here's how you'd make the <code>button</code> element with the id <code>target6</code> fade out: <code>$(\"#target6\").addClass(\"animated fadeOut\")</code>."
+        "Here's how you'd make the <code>button</code> element with the id <code>target6</code> fade out:",
+        "<code>$(\"#target6\").addClass(\"animated fadeOut\")</code>."
       ],
       "tests": [
         "assert($(\"#target3\").hasClass(\"animated\"), 'Select the <code>button</code>element with the <code>id</code> of <code>target3</code> and use the jQuery <code>addClass&#40&#41</code> function to give it the class of <code>animated</code>.')",
@@ -172,7 +174,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -223,7 +225,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -255,8 +257,10 @@
       "title": "Target the same element with multiple jQuery Selectors",
       "description": [
         "Now you know three ways of targeting elements: by type: <code>$(\"button\")</code>, by class: <code>$(\".btn\")</code>, and by id <code>$(\"#target1\")</code>.",
-        "Use each of these jQuery selectors to target your <code>button</code> element with the class <code>btn</code> and the id <code>target1</code>.",
-        "Use the <code>addClass()</code> jQuery function to give the element one new class for each selector: <code>animated</code>, <code>shake</code>, and <code>btn-primary</code>."
+        "Using each of the above jQuery selectors and the <code>addClass()</code> function:",
+        "Add the <code>animated</code> class to all elements with type <code>button</code>.",
+        "Add the <code>shake</code> class to all the buttons with class <code>.btn</code>.",
+        "Add the <code>btn-primary</code> class to the button with id <code>#target1</code>."
       ],
       "tests": [
         "assert(editor.match(/\\$\\s*?\\(\\s*?(?:'|\")\\s*?button\\s*?(?:'|\")/gi), 'Use the <code>$&#40\"button\"&#41</code> selector.')",
@@ -273,7 +277,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -305,7 +309,8 @@
       "title": "Remove Classes from an element with jQuery",
       "description": [
         "In the same way you can add classes to an element with jQuery's <code>addClass()</code> function, you can remove them with jQuery's <code>removeClass()</code> function.",
-        "Here's how you would do this for a specific button, add <code>$(\"#target2\").removeClass(\"btn-default\");</code>",
+        "Here's how you would do this for a specific button:",
+        "<code>$(\"#target2\").removeClass(\"btn-default\");</code>",
         "Let's remove the <code>btn-default</code> class from all of our <code>button</code> elements."
       ],
       "tests": [
@@ -323,7 +328,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -356,7 +361,8 @@
       "description": [
         "We can also change the CSS of an HTML element directly with jQuery.",
         "jQuery has a function called <code>.css()</code> that allows you to change the CSS of an element.",
-        "Here's how we would change its color to blue: <code>$(\"#target1\").css(\"color\", \"blue\");</code>",
+        "Here's how we would change its color to blue:",
+        "<code>$(\"#target1\").css(\"color\", \"blue\");</code>",
         "This is slightly different from a normal CSS declaration, because the CSS property and its value are in quotes, and separated with a comma instead of a colon.",
         "Delete your jQuery selectors, leaving an empty <code>document ready function</code>.",
         "Select <code>target1</code> and change its color to red."
@@ -376,7 +382,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -410,7 +416,8 @@
         "You can also change the non-CSS properties of HTML elements with jQuery. For example, you can disable buttons.",
         "When you disable a button, it will become grayed-out and can no longer be clicked.",
         "jQuery has a function called <code>.prop()</code> that allows you to adjust the properties of elements.",
-        "Here's how you would disable all buttons: <code>$(\"button\").prop(\"disabled\", true);</code>",
+        "Here's how you would disable all buttons:",
+        "<code>$(\"button\").prop(\"disabled\", true);</code>",
         "Disable only the <code>target1</code> button."
       ],
       "tests": [
@@ -426,7 +433,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -474,7 +481,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -507,7 +514,8 @@
       "description": [
         "Now let's try moving elements from one <code>div</code> to another.",
         "jQuery has a function called <code>appendTo()</code> that allows you to select HTML elements and append them to another element.",
-        "For example, if we wanted to move <code>target4</code> from our right well to our left well, we would use <code>$(\"#target4\").appendTo(\"#left-well\");</code>",
+        "For example, if we wanted to move <code>target4</code> from our right well to our left well, we would use:",
+        "<code>$(\"#target4\").appendTo(\"#left-well\");</code>",
         "Move your <code>target2</code> element from your <code>left-well</code> to your <code>right-well</code>."
       ],
       "tests": [
@@ -525,7 +533,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -558,7 +566,8 @@
       "description": [
         "In addition to moving elements, you can also copy them from one place to another.",
         "jQuery has a function called <code>clone()</code> that makes a copy of an element.",
-        "For example, if we wanted to copy <code>target2</code> from our <code>left-well</code> to our <code>right-well</code>, we would use <code>$(\"#target2\").clone().appendTo(\"#right-well\");</code>",
+        "For example, if we wanted to copy <code>target2</code> from our <code>left-well</code> to our <code>right-well</code>, we would use:",
+        "<code>$(\"#target2\").clone().appendTo(\"#right-well\");</code>",
         "Did you notice this involves sticking two jQuery functions together? This is called <code>function chaining</code> and it's a convenient way to get things done with jQuery.",
         "Clone your <code>target5</code> element and append it to your <code>left-well</code>."
       ],
@@ -578,7 +587,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -612,7 +621,8 @@
         "Every HTML element has a <code>parent</code> element from which it <code>inherits</code> properties.",
         "For example, your <code>jQuery Playground</code> <code>h3</code> element has the parent element of <code>&#60;div class=\"container-fluid\"&#62</code>, which itself has the parent <code>body</code>.",
         "jQuery has a function called <code>parent()</code> that allows you to access the parent of whichever element you've selected.",
-        "Here's an example of how you would use the <code>parent()</code> function if you wanted to give the parent element of the <code>left-well</code> element a background color of blue: <code>$(\"#left-well\").parent().css(\"background-color\", \"blue\")</code>",
+        "Here's an example of how you would use the <code>parent()</code> function if you wanted to give the parent element of the <code>left-well</code> element a background color of blue:",
+        "<code>$(\"#left-well\").parent().css(\"background-color\", \"blue\")</code>",
         "Give the parent of the <code>#target1</code> element a background-color of red."
       ],
       "tests": [
@@ -633,7 +643,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -667,7 +677,8 @@
         "Many HTML elements have <code>children</code> which <code>inherit</code> their properties from their parent HTML elements.",
         "For example, every HTML element is a child of your <code>body</code> element, and your \"jQuery Playground\" <code>h3</code> element is a child of your <code>&#60;div class=\"container-fluid\"&#62</code> element.",
         "jQuery has a function called <code>children()</code> that allows you to access the children of whichever element you've selected.",
-        "Here's an example of how you would use the <code>children()</code> function to give the children of your <code>left-well</code> element the color of blue: <code>$(\"#left-well\").children().css(\"color\", \"blue\")</code>",
+        "Here's an example of how you would use the <code>children()</code> function to give the children of your <code>left-well</code> element the color of blue:",
+        "<code>$(\"#left-well\").children().css(\"color\", \"blue\")</code>",
         "Give all the children of your <code>#right-well</code> element a color of green."
       ],
       "tests": [
@@ -688,7 +699,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -722,8 +733,9 @@
         "You've seen why id attributes are so convenient for targeting with jQuery selectors. But you won't always have such neat ids to work with.",
         "Fortunately, jQuery has some other tricks for targeting the right elements.",
         "jQuery uses CSS Selectors to target elements. <code>target:nth-child(n)</code> css selector allows you to select all the nth element with the target class or element type.",
-        "Make the second child in each of your well elements bounce. You must target the children of element with the <code>target</code> class.",
-        "Here's how you would give the third element in each well bounce: <code>$(\".target:nth-child(3)\").addClass(\"animated bounce\");</code>"
+        "Here's how you would give the third element in each well bounce:",
+        "<code>$(\".target:nth-child(3)\").addClass(\"animated bounce\");</code>",
+        "Make the second child in each of your well elements bounce. You must target the children of element with the <code>target</code> class."
       ],
       "tests": [
         "assert($(\".target:nth-child(2)\").hasClass(\"animated\") && $(\".target:nth-child(2)\").hasClass(\"bounce\"), 'The second element in your <code>target</code> elements should bounce.')",
@@ -744,7 +756,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -776,9 +788,9 @@
       "title": "Target Even Numbered Elements Using jQuery",
       "description": [
         "You can also target all the even-numbered elements.",
-        "Here's how you would target all the odd-numbered elements with class <code>target</code> and give them classes: <code>$(\".target:odd\").addClass(\"animated shake\");</code>",
-        "Note that jQuery is zero-indexed, meaning that, counter-intuitively, <code>:odd</code> selects the second element, fourth element, and so on.",
-        "Try selecting all the even-numbered elements - that is, what your browser will consider even-numbered elements - and giving them the classes of <code>animated</code> and <code>shake</code>."
+        "Here's how you would target all the odd-numbered elements with class <code>target</code> and give them classes:",
+        "<code>$(\".target:odd\").addClass(\"animated shake\");</code>",
+        "Try selecting all the even-numbered elements and giving them the classes of <code>animated</code> and <code>shake</code>."
       ],
       "tests": [
         "assert($('.target:even').hasClass('animated') && $('.target:even').hasClass('shake'), 'All the <code>target</code> elements that computer considers even should shake.')",
@@ -801,7 +813,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
@@ -857,7 +869,7 @@
         "  });",
         "fcces",
         "",
-        "<!-- You shouldn't need to modify code below this line -->",
+        "<!-- Only change code above this line. -->",
         "",
         "<div class=\"container-fluid\">",
         "  <h3 class=\"text-primary text-center\">jQuery Playground</h3>",
diff --git a/seed/challenges/json-apis-and-ajax.json b/seed/challenges/json-apis-and-ajax.json
new file mode 100644
index 0000000000..ea3a4351e2
--- /dev/null
+++ b/seed/challenges/json-apis-and-ajax.json
@@ -0,0 +1,404 @@
+{
+  "name": "JSON APIs and Ajax",
+  "order": 10.5,
+  "time": "30m",
+  "challenges": [
+    {
+      "id": "bb000000000000000000001",
+      "title":  "Trigger Click Events with jQuery",
+      "description": [
+        "In this section, we'll learn how to get data from APIs. APIs - or Application Interfaces - are tools that computers use to communicate with one another.",
+        "We'll also learn how to update HTML with the data we get from these APIs using a technology called Ajax.",
+        "First, let's review what the <code>$(document).ready()</code> function does. This function makes it so all code inside of it only runs  once our page loads.",
+        "Let's make our \"Get Message\" button change the text of the element with the class <code>message</code>.",
+        "Before we can do this, we need to implement a <code>click event</code> inside of our <code>$(document).ready()</code> function by adding this code:",
+        "<code>$(\"#getMessage\").on(\"click\", function(){</code>",
+        "",
+        "<code>});</code>"
+      ],
+      "tests": [
+        "assert(editor.match(/\\$\\s*?\\(\\s*?(?:'|\")\\#getMessage(?:'|\")\\s*?\\)\\s*?\\.on\\s*?\\(\\s*?(?:'|\")click(?:'|\")\\s*?\\,\\s*?function\\s*?\\(\\s*?\\)\\s*?\\{/gi), 'Bind the click event to the button with the ID of <code>getMessage</code>')",
+        "assert(editor.match(/\\n*?\\s*?\\}\\n*?\\s*?\\);/gi) && editor.match(/\\n*?\\s*?\\}\\);/gi).length >= 2, 'Be sure to close your functions with <code>}&#41;;</code>')"
+      ],
+      "challengeSeed": [
+        "fccss",
+        "  $(document).ready(function() {",
+        "    // Only change code below this line.",
+        "    ",
+        "    // Only change code above this line.",
+        "  });",
+        "fcces",
+        "",
+        "",
+        "<div class=\"container-fluid\">",
+        " <div class = \"row text-center\">",
+        "   <h2>Cat Photo Finder</h2>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12 well message\">",
+        "     The message will go here",
+        "   </div>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12\">",
+        "     <button id = \"getMessage\" class = \"btn btn-primary\">",
+        "       Get Message",
+        "     </button>",
+        "   </div>",
+        " </div>",
+        "</div>"
+      ],
+      "challengeType": 0,
+      "type": "waypoint"
+    },
+    {
+      "id": "bc000000000000000000001",
+      "title":  "Change Text with Click Events",
+      "description": [
+        "When our click event happens, we can use Ajax to update an HTML element.",
+        "Let's make it so that when a user clicks the \"Get Message\" button, we change the text of the element with the class <code>message</code> to say \"Here is the message\".",
+        "We can do this by adding the following code within our click event:",
+        "<code>&thinsp;&thinsp;$(\".message\").html(\"Here is the message\");</code>"
+      ],
+      "tests": [
+        "assert(editor.match(/\\$\\s*?\\(\\s*?(?:'|\")\\.message(?:'|\")\\s*?\\)\\s*?\\.html\\s*?\\(\\s*?(?:'|\")Here\\sis\\sthe\\smessage(?:'|\")\\s*?\\);/gi), 'Clicking the \"Get Message\" button should give the element with the class <code>message</code> the text \"Here is the message\".')"
+      ],
+      "challengeSeed": [
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $(\"#getMessage\").on(\"click\", function(){",
+        "      // Only change code below this line.",
+        "",
+        "      // Only change code above this line.",
+        "    });",
+        "  });",
+        "fcces",
+        "",
+        "",
+
+        "<div class=\"container-fluid\">",
+        " <div class = \"row text-center\">",
+        "   <h2>Cat Photo Finder</h2>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12 well message\">",
+        "     The message will go here",
+        "   </div>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12\">",
+        "     <button id = \"getMessage\" class = \"btn btn-primary\">",
+        "       Get Message",
+        "     </button>",
+        "   </div>",
+        " </div>",
+        "</div>"
+      ],
+      "challengeType": 0,
+      "type": "waypoint"
+    },
+    {
+      "id": "bb000000000000000000002",
+      "title": "Get JSON with the jQuery getJSON Method",
+      "description": [
+        "You can also request data from an external source. This is where APIs come into play.",
+        "Remember that APIs - or Application Interfaces - are tools that computers use to communicate with one another.",
+        "Most web APIs transfer data in a format called JSON. JSON stands for JavaScript Object Notation.",
+        "You've already been using JSON whenever you create a JavaScript object. JSON is nothing more than object properties and their current values, sandwiched between a <code>{</code> and a <code>}</code>.",
+        "These properties and their values are often referred to as \"key-value pairs\".",
+        "Let's get the JSON from Free Code Camp's Cat Photo API.",
+        "Here's the code you can put in your click event to do this:",
+        "<code>&thinsp;&thinsp;$.getJSON(\"/json/cats.json?callback=\", function( json ) {</code>",
+        "<code>&thinsp;&thinsp;&thinsp;&thinsp;$(\".message\").html(JSON.stringify(json))</code>",
+        "<code>&thinsp;&thinsp;});</code>",
+        "Once you've added this, click the \"Get Message\" button. Your Ajax function will replace the \"The message will go here\" text with the raw JSON output from the Free Code Camp Cat Photo API."
+      ],
+      "tests": [
+        "assert(editor.match(/\\$\\s*?\\(\\s*?(\\\"|\\')\\#getMessage(\\\"|\\')\\s*?\\)\\s*?\\.\\s*?on\\s*?\\(\\s*?(\\\"|\\')click(\\\"|\\')\\s*?\\,\\s*?function\\s*?\\(\\s*?\\)\\s*?\\{/gi), 'You should have a click handler on the getMessage button to trigger the AJAX request.')",
+        "assert(editor.match(/\\s*?\\}\\s*?\\)\\s*?\\;/gi), 'You should have at least on closing set of brackets and parenthesis.')",
+        "assert(editor.match(/\\s*?\\}\\s*?\\)\\s*?\\;/gi) && editor.match(/\\,\\s*?function\\s*?\\(\\s*?\\w*?\\s*?\\)\\s*?\\{/gi) && editor.match(/\\s*?\\}\\s*?\\)\\s*?\\;/gi).length === editor.match(/\\s*?function\\s*?\\(\\s*?\\w*?\\s*?\\)\\s*?\\{/gi).length, 'Each callback function should have a closing set of brackets and parenthesis.')",
+        "assert(editor.match(/\\$\\s*?\\.\\s*?getJSON\\s*?\\(\\s*?\"\\\/json\\\/cats\\.json\\?callback\\=\"\\s*?\\,\\s*?function\\s*?\\(\\s*?json\\s*?\\)\\s*?\\{/gi), 'You should be making use of the getJSON method given in the description to load data from the json file.')",
+        "assert(editor.match(/\\$\\s*?\\(\\s*?\\\"\\.message\\\"\\s*?\\)\\s*?\\.\\s*?html\\s*?\\(\\s*?JSON\\s*?\\.\\s*?stringify\\s*?\\(\\s*?json\\s*?\\)\\s*?\\)/gi), 'Don\\'t forget to make the <code>.html</code> change the contents of the message box so that it contains the result of the getJSON.')"
+      ],
+      "challengeSeed": [
+        "fccss",
+        " $(document).ready(function() {",
+        "   ",
+        "   $(\"#getMessage\").on(\"click\", function(){",
+        "    // Only change code below this line.",
+        "",
+        "",
+        "",
+        "    // Only change code above this line.",
+        "   });",
+        "   ",
+        " });",
+        "fcces",
+        "",
+        "<div class=\"container-fluid\">",
+        " <div class = \"row text-center\">",
+        "   <h2>Cat Photo Finder</h2>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12 well message\">",
+        "     The message will go here",
+        "   </div>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12\">",
+        "     <button id = \"getMessage\" class = \"btn btn-primary\">",
+        "       Get Message",
+        "     </button>",
+        "   </div>",
+        " </div>",
+        "</div>"
+      ],
+      "challengeType": 0,
+      "type": "waypoint"
+    },
+    {
+      "id": "bb000000000000000000003",
+      "title":  "Convert JSON Data to HTML",
+      "description": [
+        "Now that we're getting data from a JSON API, let's display it in our HTML.",
+        "We can use the <code>.map()</code> method to loop through our data and modify our HTML elements.",
+        "First, let's declare an html variable with <code>var html = \"\";</code>.",
+        "Then, let's loop through our JSON, adding more HTML to that variable. When the loop is finished, we'll render it.",
+        "Here's the code that does this:",
+        "<code>json.map(function(val) {</code>",
+        "<code>&thinsp;&thinsp;html = html + \"&lt;div class = 'cat'&gt;\"</code>",
+        "<code>&thinsp;&thinsp;for(var key in val) {</code>",
+        "<code>&thinsp;&thinsp;&thinsp;&thinsp;html = html + '&lt;div class = \"' + key + '\"&gt;' + val[key] + '&lt;/div&gt;';</code>",
+        "<code>&thinsp;&thinsp;}</code>",
+        "<code>&thinsp;&thinsp;html = html + \"&lt;/div&gt;&lt;br/&gt;\"</code>",
+        "<code>});</code>"
+      ],
+      "tests": [
+        "assert(editor.match(/json\\.map/gi), 'The message box should have something in it.')"
+    ],
+      "challengeSeed": [
+        "fccss",
+        "  $(document).ready(function() {",
+        "",
+        "    $(\"#getMessage\").on(\"click\", function() {",
+        "      $.getJSON(\"/json/cats.json?callback=\", function( json ) {",
+        "",
+        "        // Only change code below this line.",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "",
+        "        // Only change code above this line.",
+        "",
+        "        $(\".message\").html(html);",
+        "",
+        "      });",
+        "    });",
+        "  });",
+        "fcces",
+        "",
+        "<div class=\"container-fluid\">",
+        " <div class = \"row text-center\">",
+        "   <h2>Cat Photo Finder</h2>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12 well message\">",
+        "     The message will go here","   </div>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12\">",
+        "     <button id = \"getMessage\" class = \"btn btn-primary\">",
+        "       Get Message",
+        "     </button>",
+        "   </div>",
+        " </div>",
+        "</div>"
+      ],
+      "challengeType": 0,
+      "type": "waypoint"
+    },
+    {
+      "id": "bb000000000000000000004",
+      "title":  "Render Images from Data Sources",
+      "description": [
+        "In the JSON that we receive from Free Code Camp's Cat Photo API, each object has an attribute called \"imageLink\".",
+        "When we're looping through these objects, let's check whether an object attribute (key) is <code>imageLink</code>. If it is, instead of outputing the image link, let's render the image.",
+        "Here's the code that does this:",
+        "<code>if(key === \"imageLink\") {</code>",
+        "<code>&thinsp;&thinsp;html = html + '&lt;img class = \"' + key + '\"src = \"' + val[key] + '\"&gt;';</code>",
+        "<code>} else {</code>",
+        "<code>&thinsp;&thinsp;html = html + '&lt;div class = \"' + key + '\"&gt;' + val[key] + '&lt;/div&gt;';</code>",
+        "<code>}</code>"
+      ],
+      "tests": [
+        "assert(editor.match(/imageLink/gi), 'You should have accessed the imageLink of each cat object.')"
+      ],
+      "challengeSeed": [
+        "fccss",
+        "  $(document).ready(function() {",
+        "",
+        "    $(\"#getMessage\").on(\"click\", function() {",
+        "      $.getJSON(\"/json/cats.json?callback=\", function( json ) {",
+        "",
+        "        var html = \"\";",
+        "",
+        "        json.map(function(val) {",
+        "",
+        "          html = html + \"<div class = 'cat'>\"",
+        "",
+        "          for (var key in val) {",
+        "",
+        "            // Only change code below this line.",
+        "",
+        "",
+        "",
+        "            // Only change code above this line.",
+        "",
+        "          }",
+        "",
+        "          html = html + \"</div>\"",
+        "",
+        "        });",
+        "",
+        "        $(\".message\").html(html);",
+        "",
+        "      });",
+        "    });",
+        "  });",
+        "fcces",
+        "",
+        "<div class=\"container-fluid\">",
+        " <div class = \"row text-center\">",
+        "   <h2>Cat Photo Finder</h2>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12 well message\">",
+        "     The message will go here",
+        "   </div>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12\">",
+        "     <button id = \"getMessage\" class = \"btn btn-primary\">",
+        "       Get Message",
+        "     </button>",
+        "   </div>",
+        " </div>",
+        "</div>"
+      ],
+      "challengeType": 0,
+      "type": "waypoint"
+    },
+    {
+      "id": "bb000000000000000000005",
+      "title":  "Prefilter JSON",
+      "description": [
+        "If we don't want to render every cat photo we get from our Free Code Camp's Cat Photo JSON API, we can pre-filter the json before we loop through it.",
+        "Let's filter out the cat who's \"id\" key has a value of 1.",
+        "Here's the code to do this:",
+        "<code>json = json.filter(function(val) {</code>",
+        "<code>&thinsp;&thinsp;return(val.id !== 1);</code>",
+        "<code>});</code>"
+      ],
+      "tests": [
+        "assert(editor.match(/filter/gi), 'You should be making use of the .filter method.')"
+      ],
+      "challengeSeed": [
+        "fccss",
+        "  $(document).ready(function() {",
+        "",
+        "    $(\"#getMessage\").on(\"click\", function() {",
+        "      $.getJSON(\"/json/cats.json?callback=\", function( json ) {",
+        "",
+        "        var html = \"\";",
+        "",
+        "        json.map(function(val){",
+        "",
+        "          val = \"<img src = '\" + val.imageLink + \"'/>\" ",
+        "",
+        "          html = html + \"<div class = 'cat'>\"",
+        "",
+        "          // Only change code below this line.",
+        "",
+        "",
+        "",
+        "          // Only change code above this line.",
+        "",
+        "          for(var key in val){",
+        "",
+        "            html = html + '<div class = \"' + key + '\">' + val[key] + '</div>';",
+        "",
+        "          }",
+        "",
+        "          html = html + \"</div>\"",
+        "",
+        "        });",
+        "",
+        "        $(\".message\").html(html);",
+        "",
+        "      });",
+        "    });",
+        "  });",
+        "fcces",
+        "",
+        "",
+        "<div class=\"container-fluid\">",
+        " <div class = \"row text-center\">",
+        "   <h2>Cat Photo Finder</h2>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12 well message\">",
+        "     The message will go here",
+        "   </div>",
+        " </div>",
+        " <div class = \"row text-center\">",
+        "   <div class = \"col-xs-12\">",
+        "     <button id = \"getMessage\" class = \"btn btn-primary\">",
+        "       Get Message",
+        "     </button>",
+        "   </div>",
+        " </div>",
+        "</div>",
+        ""
+      ],
+      "challengeType": 0,
+      "type": "waypoint"
+    },
+    {
+      "id": "bb000000000000000000006",
+      "title":  "Get Geo-location Data",
+      "description": [
+        "Another cool thing we can do is access our user's current location. Every browser has a built in navigator that can give us this information.",
+        "The navigator will get our user's current longitude and latitude.",
+        "Here's some code that does this:",
+        "<code>if (navigator.geolocation) {</code>",
+        "<code>&thinsp;&thinsp;navigator.geolocation.getCurrentPosition(function(position) {</code>",
+        "<code>&thinsp;&thinsp;&thinsp;&thinsp;$(\"#data\").html(\"latitiude\" + position.coords.latitude + \"longitude\" + position.coords.longitude);</code>",
+        "<code>&thinsp;&thinsp;});</code>",
+        "<code>}</code>"
+      ],
+      "tests": [
+        "assert(editor.match(/navigator\\.geolocation\\.getCurrentPosition/gi), 'You should make use of the <code>navigator.geolocation</code> to access the users current location.')"
+      ],
+      "challengeSeed": [
+        "fccss",
+        "  // Only change code below this line.",
+        "",
+        "",
+        "",
+        "  // Only change code above this line.",
+        "fcces",
+        "<div id = \"data\">",
+        "  <h4>You are here:</h4>",
+        "  ",
+        "</div>"
+      ],
+      "challengeType": 0,
+      "type": "waypoint"
+    }
+  ]
+}
diff --git a/seed/challenges/mongodb.json b/seed/challenges/mongodb.json
index 0fe93ba6f9..facfb56089 100644
--- a/seed/challenges/mongodb.json
+++ b/seed/challenges/mongodb.json
@@ -25,7 +25,7 @@
         "Complete \"Mongod\"",
         "Complete \"Connect\"",
         "Complete \"Find\"",
-        "Complete \"Find Limit\"",
+        "Complete \"Find Project\"",
         "Complete \"Insert\"",
         "Complete \"Update\"",
         "Complete \"Remove\"",
diff --git a/seed/challenges/nodejs-and-expressjs.json b/seed/challenges/nodejs-and-expressjs.json
index 36b2231409..f046a45006 100644
--- a/seed/challenges/nodejs-and-expressjs.json
+++ b/seed/challenges/nodejs-and-expressjs.json
@@ -98,7 +98,7 @@
       "description": [
         "Let's continue the LearnYouNode Node School challenge. For this Waypoint, we'll do challenges 8 through 10.",
         "Make sure that you are always in your project's \"workspace\" directory. You can always navigate back to this directory by running this command: <code>cd ~/workspace</code>.",
-        "Return to the c9.io workspace you created Now start this tutorial by running <code>learnyounode</code>",
+        "Return to the c9.io workspace you created. Now start this tutorial by running <code>learnyounode</code>",
         "You can view this Node School module's source code on GitHub at <a href='https://github.com/workshopper/learnyounode'>https://github.com/workshopper/learnyounode</a>.",
         "Complete \"HTTP Collect\"",
         "Complete \"Juggling Async\"",
diff --git a/seed/challenges/object-oriented-and-functional-programming.json b/seed/challenges/object-oriented-and-functional-programming.json
index 8f1c7a8a1a..95c6d73b85 100644
--- a/seed/challenges/object-oriented-and-functional-programming.json
+++ b/seed/challenges/object-oriented-and-functional-programming.json
@@ -15,7 +15,6 @@
     {
       "id":"cf1111c1c15feddfaeb1bdef",
       "title": "Declare JavaScript Objects as Variables",
-      "difficulty":0,
       "description":[
         "Before we dive into Object Oriented Programming, let's revisit JavaScript objects.",
         "Give your <code>motorBike</code> object a <code>wheels</code>, <code>engines</code> and <code>seats</code> attribute and set them to numbers."
@@ -26,21 +25,20 @@
         "assert(typeof(motorBike.seats) === 'number', 'message: <code>motorBike</code> should have a <code>seats</code> attribute set to a number.');"
       ],
       "challengeSeed":[
-        "//Here is a sample Object",
         "var car = {",
         "  \"wheels\":4,",
         "  \"engines\":1,",
         "  \"seats\":5",
         "};",
         "",
-        "//Now Let's make a similar Object called motorBike",
-        "//Give it two wheels, one engine and one seat",
         "var motorBike = {",
+        "",
         "  // Only change code below this line.",
         "",
         "",
         "",
         "  // Only change code above this line.",
+        "",
         "};",
         "",
         "(function() {return JSON.stringify(motorBike);})();"
@@ -52,10 +50,16 @@
     {
       "id":"cf1111c1c15feddfaeb2bdef",
       "title": "Construct JavaScript Objects with Functions",
-      "difficulty":0,
       "description":[
         "We are also able to create objects using <code>constructor</code> functions.",
-        "Give your <code>myMotorBike</code> object a <code>wheels</code>, <code>engines</code> and <code>seats</code> attribute and set them to numbers."
+        "Here's an example of a constructor function:",
+        "<code>var Car = function() {</code>",
+        "<code>&thinsp;&thinsp;this.wheels = 4;</code>",
+        "<code>&thinsp;&thinsp;this.engines = 1;</code>",
+        "<code>&thinsp;&thinsp;this.seats = 1;</code>",
+        "<code>};</code>",
+        "Give your <code>myMotorBike</code> object a <code>wheels</code>, <code>engines</code> and <code>seats</code> attribute and set them to numbers.",
+        "You may be confused by the <code>this</code> keyword here. Don't worry, we will get to that very soon."
       ],
       "tests":[
         "assert(typeof((new MotorBike()).engines) === 'number', 'message: <code>myMotorBike</code> should have a <code>engines</code> attribute set to a number.');",
@@ -63,7 +67,6 @@
         "assert(typeof((new MotorBike()).seats) === 'number', 'message: <code>myMotorBike</code> should have a <code>seats</code> attribute set to a number.');"
       ],
       "challengeSeed":[
-        "// Let's add the properties engines and seats to the car in the same way that the property wheels has been added below. They should both be numbers.",
         "var Car = function() {",
         "  this.wheels = 4;",
         "  this.engines = 1;",
@@ -73,6 +76,7 @@
         "var myCar = new Car();",
         "",
         "// Only change code below this line.",
+        "",
         "var MotorBike = function() {",
         "",
         "",
@@ -80,6 +84,7 @@
         "};",
         "",
         "var myMotorBike = new MotorBike();",
+        "",
         "// Only change code above this line.",
         "",
         "(function() {return JSON.stringify(myMotorBike);})();"
@@ -90,49 +95,57 @@
     {
       "id":"cf1111c1c15feddfaeb3bdef",
       "title":"Make Object Properties Private",
-      "difficulty":0,
       "description":[
         "Objects have their own attributes, called <code>properties</code>, and their own functions, called <code>methods</code>.",
         "In the previous challenge, we used the <code>this</code> keyword to reference <code>public properties</code> and <code>public methods</code> of the current object.",
         "We can also create <code>private properties</code> and <code>private methods</code>, which aren't accessible from outside the object.",
-        "To do this, we omit the word <code>this</code> from the <code>property</code> or <code>method</code> declaration.",
+        "To do this, just declare properties or functions within the constructor.",
+        "Let's create an object with two functions. One attached as a property and one not.",
         "See if you can keep <code>myBike.speed</code> and <code>myBike.addUnit</code> private, while making <code>myBike.getSpeed</code> publicly accessible."
       ],
       "tests":[
         "assert(typeof(myBike.getSpeed)!=='undefined' && typeof(myBike.getSpeed) === 'function', 'message: The method getSpeed of myBike should be accessible outside the object.');",
-        "assert(typeof(myBike.speed) === 'undefined', 'message: <code>myBike.speed</code> should remain undefined.');",
+        "assert(typeof(myBike.speed) === 'undefined', 'message: <code>myBike.speed</code> should be undefined.');",
         "assert(typeof(myBike.addUnit) === 'undefined', 'message: <code>myBike.addUnit</code> should remain undefined.');"
       ],
       "challengeSeed":[
-        "//Let's create an object with two functions. One attached as a property and one not.",
         "var Car = function() {",
-        "  this.gear = 1;",
+        " // this is a private variable",
+        "  var gear = 1;",
+        " // this is a private function (also known as a private method)",
         "  function addStyle(styleMe){",
         "    return 'The Current Gear Is: ' + styleMe;",
         "  }",
+        " // this is a public method",
         "  this.getGear = function() {",
         "    return addStyle(this.gear);",
         "  };",
+        "",
         "};",
         "",
         "var Bike = function() {",
+        "",
         "  // Only change code below this line.",
+        "",
         "  this.speed = 100;",
+        "",
         "  function addUnit(value) {",
         "    return value + \"KM/H\";",
         "  }",
-        "  ",
+        "",
         "  getSpeed = function () {",
         "    return addUnit(speed);",
         "  };",
-        "  ",
+        "",
         "};",
         "",
         "// Only change code above this line.",
+        "",
         "var myCar = new Car();",
+        "",
         "var myBike = new Bike();",
         "",
-        "if(myBike.hasOwnProperty('getSpeed')){(function() {return JSON.stringify(myBike.getSpeed());})();};"
+        "if(myBike.hasOwnProperty('getSpeed')){(function() {return JSON.stringify(myBike.getSpeed());})();}"
       ],
       "challengeType":1,
       "type": "waypoint"
@@ -140,17 +153,17 @@
     {
       "id":"cf1111c1c15feddfaeb4bdef",
       "title":"Make Instances of Objects with a Constructor Function",
-      "difficulty":0,
       "description":[
-        "Sometimes you'll want to be able to easily create similar objects.",
+        "Sometimes you'll want to be able to easily create many copies of an objects that all share the same methods.",
         "Objects have their own attributes, called <code>properties</code>, and their own functions, called <code>methods</code>.",
-        "A function that creates objects is called a <code>constructor</code>.",
         "You can create <code>instances</code> of an object using a <code>constructor</code>.",
+        "A constructor is a function that creates instances of an object that share the same methods and properties",
         "Each new <code>instance</code> of this object <code>inherits</code> all the <code>properties</code> and <code>methods</code> of your original object.",
-        "Then you can give the instance new properties."
+        "Once an <code>instance</code> has been created you can add <code>properties</code> to that <code>instance</code> individually.",
+        "Add an <code>engines</code> property with a number value to the <code>myCar</code> instance."
       ],
       "tests":[
-        "assert((new Car()).wheels === 4, 'message: The property <code>wheels</code> should still be 4 like in the object constructor.');",
+        "assert((new Car()).wheels === 4, 'message: The property <code>wheels</code> should still be 4 in the object constructor.');",
         "assert(typeof((new Car()).engines) === 'undefined', 'message: There should not be a property <code>engines</code> in the object constructor.');",
         "assert(myCar.wheels === 4, 'message: The property <code>wheels</code> of myCar should equal 4.');",
         "assert(typeof(myCar.engines) === 'number', 'message: The property <code>engines</code> of myCar should be a number.');"
@@ -163,7 +176,6 @@
         "// Only change code below this line.",
         "var myCar = new Car();",
         "",
-        "//Add the property \"engines\" to myCar, and make it a number.",
         "",
         "",
         "// Only change code above this line.",
@@ -175,29 +187,34 @@
     {
       "id":"cf1111c1c15feddfaeb7bdef",
       "title":"Iterate over Arrays with .map",
-      "difficulty":0,
       "description":[
-        "<code>array = array.map(function(val){</code>",
-        "<code>&thinsp;&thinsp;return val+1;</code>",
+        "The <code>map</code> method is a convenient way to iterate through arrays. Here's an example usage:",
+        "<code>var timesFour = array.map(function(val){</code>",
+        "<code>&thinsp;&thinsp;return val*4;</code>",
         "<code>});</code>",
         "",
-        "The map method is one of the easiest ways to iterate through an array or object there is. Let's use it now.",
-        "Use the map function to add 3 to every value in the variable <code>array</code>"
+        "The <code>map</code> method will iterate through every element of the array, creating a new array with values that have been modified by the callback function, and return it.",
+        "In our example the callback only uses the value of the array element (the <code>val</code> argument) but your callback can also include arguments for the <code>index</code> and <code>array</code> being acted on.",
+        "Use the map function to add 3 to every value in the variable <code>array</code>."
       ],
       "tests":[
-        "assert.deepEqual(array, [4,5,6,7,8], 'message: You should add three to each value in the array.');",
-        "assert(editor.getValue().match(/\\.map\\s*\\(/gi), 'message: You should be making use of the map method.');",
-        "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\]/gi), 'message: You should only modify the array with <code>.map</code>.');"
+        "assert.deepEqual(newArray, [4,5,6,7,8], 'message: You should add three to each value in the array.');",
+        "assert(editor.getValue().match(/\\.map\\s*\\(/gi), 'message: You should be making use of the <code>map</code> method.');",
+        "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\]/gi), 'message: You should only modify the array with <code>map</code>.');"
       ],
       "challengeSeed":[
-        "//Use map to add three to each value in the array",
-        "var array = [1,2,3,4,5];",
+        "var oldArray = [1,2,3,4,5];",
+        "",
         "// Only change code below this line.",
         "",
         "",
+        "var newArray = oldArray;",
+        "",
+        "",
         "",
         "// Only change code above this line.",
-        "(function() {return array;})();"
+        "",
+        "(function() {return newArray;})();"
       ],
       "challengeType":1,
       "type": "waypoint"
@@ -205,25 +222,32 @@
     {
       "id":"cf1111c1c15feddfaeb8bdef",
       "title":"Condense arrays with .reduce",
-      "difficulty":0,
       "description":[
-        "Reduce can be useful for condensing an array of numbers into one value.",
-        "<code>var singleVal = array.reduce(function(previousVal, currentVal){</code>",
-        "<code>&thinsp;&thinsp;return previousVal+currentVal;</code>",
-        "<code>});</code>"
+        "The array method <code>reduce</code> is used to iterate through an array and condense it into one value.",
+        "To use <code>reduce</code> you pass in a callback whose arguments are an accumulator (in this case, <code>previousVal</code>) and the current value (<code>currentVal</code>).",
+        "<code>reduce</code> has an optional second argument which can be used to set the initial value of the accumulator. If no initial value is specified it will be the first array element and currentVal will start with the second array element.",
+        "Here is an example of <code>reduce</code> being used to subtract all the values of an array:",
+        "<code>var singleVal = array.reduce(function(previousVal, currentVal) {</code>",
+        "<code>&thinsp;&thinsp;return previousVal - currentVal;</code>",
+        "<code>}, 0);</code>",
+        "Use the <code>reduce</code> method to sum all the values in <code>array</code> and assign it to <code>singleVal</code>."
       ],
       "tests":[
-        "assert(singleVal == 30, 'message: <code>singleVal</code> should have been set to the result of your reduce operation.');",
-        "assert(editor.getValue().match(/\\.reduce\\s*\\(/gi), 'message: You should have made use of the reduce method.');"
+        "assert(singleVal == 30, 'message: <code>singleVal</code> should be equal to the sum of all items in the <code>array</code> variable.');",
+        "assert(editor.getValue().match(/\\.reduce\\s*\\(/gi), 'message: You should have made use of the <code>reduce</code> method.');"
       ],
       "challengeSeed":[
         "var array = [4,5,6,7,8];",
-        "var singleVal = 0;",
+        "",
+        "",
         "// Only change code below this line.",
         "",
+        "var singleVal = array;",
+        "",
         "",
         "",
         "// Only change code above this line.",
+        "",
         "(function() {return singleVal;})();"
       ],
       "challengeType":1,
@@ -232,27 +256,32 @@
     {
       "id":"cf1111c1c15feddfaeb9bdef",
       "title":"Filter Arrays with .filter",
-      "difficulty":0,
       "description":[
-        "filter is a useful method that can filter out values that don't match a certain criteria",
-        "Let's remove all the values greater than five",
+        "The <code>filter</code> method is used to iterate through an array and filter out elements where a given condition is not true.",
+        "<code>filter</code> is passed a callback function which takes the current value (we've called that <code>val</code>) as an argument.",
+        "Any array element for which the callback returns true will be kept and elements that return false will be filtered out.",
+        "The following code is an example of using filter to remove array elements that are not even numbers:",
+        "Note: We omit the second and third arguments since we only need the value",
         "<code>array = array.filter(function(val) {</code>",
-        "<code>&thinsp;&thinsp;return val <= 5;</code>",
-        "<code>});</code>"
+        "<code>&thinsp;&thinsp;return val % 2 === 0;</code>",
+        "<code>});</code>",
+        "Use <code>filter</code> to remove all elements from <code>array</code> that are greater than 5."
       ],
       "tests":[
-        "assert.deepEqual(array, [1,2,3,4,5], 'message: You should have removed all the values from the array that are greater than 5.');",
-        "assert(editor.getValue().match(/array\\.filter\\s*\\(/gi), 'message: You should be using the filter method to remove the values from the array.');",
-        "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\,6\\,7\\,8\\,9\\,10\\]/gi), 'message: You should only be using <code>.filter</code> to modify the contents of the array.');"
+        "assert.deepEqual(newArray, [1,2,3,4,5], 'message: You should have removed all the values from the array that are greater than 5.');",
+        "assert(editor.getValue().match(/array\\.filter\\s*\\(/gi), 'message: You should be using the <code>filter</code> method to remove the values from the array.');",
+        "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\,6\\,7\\,8\\,9\\,10\\]/gi), 'message: You should only be using <code>filter</code> to modify the contents of the array.');"
       ],
       "challengeSeed":[
-        "var array = [1,2,3,4,5,6,7,8,9,10];",
-        "  // Only change code below this line.",
+        "var oldArray = [1,2,3,4,5,6,7,8,9,10];",
         "",
+        "// Only change code below this line.",
         "",
+        "var newArray = oldArray;",
         "",
-        "  // Only change code above this line.",
-        "(function() {return array;})();"
+        "// Only change code above this line.",
+        "",
+        "(function() { return newArray; })();"
       ],
       "challengeType":1,
       "type": "waypoint"
@@ -260,26 +289,32 @@
     {
       "id":"cf1111c1c16feddfaeb1bdef",
       "title": "Sort Arrays with .sort",
-      "difficulty":0,
       "description":[
-        "You can use the method sort to easily sort the values in the array alphabetically or numerically",
-        "<code>var array = [1,3,2];</code>",
-        "<code>array = array.sort();</code>",
-        "This will return <code>[1, 2, 3]</code>"
+        "You can use the method <code>sort</code> to easily sort the values in an array alphabetically or numerically.",
+        "Unlike the previous array methods we have been looking at, <code>sort</code> actually alters the array in place. However, it also returns this sorted array.",
+        "<code>sort</code> can be passed a compare function as a callback. If no compare function is passed in it will convert the values to strings and sort alphabetically.",
+        "Here is an example of using sort with a compare function that will sort the elements from smallest to largest number:",
+        "<code>var array = [1, 12, 21, 2];</code>",
+        "<code>array.sort(function(a, b) {</code>",
+        "<code>&thinsp;&thinsp;return a - b;</code>",
+        "<code>});</code>",
+        "Use <code>sort</code> to sort <code>array</code> from largest to smallest."
       ],
       "tests":[
-        "assert.deepEqual(array, ['alpha', 'beta', 'charlie'], 'message: You should have sorted the array alphabetically.');",
-        "assert(editor.getValue().match(/\\[\\'beta\\'\\,\\s\\'alpha\\'\\,\\s'charlie\\'\\];/gi), 'message: You should be sorting the array using sort.');",
-        "assert(editor.getValue().match(/\\.sort\\s*\\(\\)/gi), 'message: You should have made use of the sort method.');"
+        "assert.deepEqual(array, [21, 12, 2, 1], 'message: You should have sorted the array from largest to smallest.');",
+        "assert(editor.getValue().match(/\\[1,\\s*12,\\s*21,\\s*2\\];/gi), 'message: You should only be using <code>sort</code> to modify the array.');",
+        "assert(editor.getValue().match(/\\.sort\\s*\\(/g), 'message: You should have made use of the <code>sort</code> method.');"
       ],
       "challengeSeed":[
-        "var array = ['beta', 'alpha', 'charlie'];",
+        "var array = [1, 12, 21, 2];",
+        "",
         "// Only change code below this line.",
         "",
+        "array.sort();",
         "",
+        "// Only change code above this line.",
         "",
-        "  // Only change code above this line.",
-        "(function() {return array;})();"
+        "(function() { return array; })();"
       ],
       "challengeType":1,
       "type": "waypoint"
@@ -288,20 +323,24 @@
       "id": "cf1111c1c16feddfaeb2bdef",
       "title": "Reverse Arrays with .reverse",
       "description": [
-        "You can use the <code>.reverse()</code> function to reverse the contents of an array."
+        "You can use the <code>reverse</code> method to reverse the elements of an array.",
+        "<code>reverse</code> is another array method that alters the array in place, but it also returns the reversed array.",
+        "Add a line of code that uses <code>reverse</code> to reverse the <code>array</code> variable."
       ],
       "tests": [
         "assert.deepEqual(array, [7,6,5,4,3,2,1], 'message: You should reverse the array.');",
-        "assert(editor.getValue().match(/\\.reverse\\s*\\(\\)/gi), 'message: You should use the reverse method.');",
-        "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\,6\\,7/gi), 'message: You should return <code>[7,6,5,4,3,2,1]</code>.');"
+        "assert(editor.getValue().match(/\\.reverse\\s*\\(\\)/gi), 'message: You should use the <code>reverse</code> method.');",
+        "assert(editor.getValue().match(/\\[1\\,2\\,3\\,4\\,5\\,6\\,7/gi), 'message: You should only be using <code>revserse</code> to modify <code>array</code>.');"
       ],
       "challengeSeed": [
         "var array = [1,2,3,4,5,6,7];",
-        "  // Only change code below this line.",
+        "",
+        "// Only change code below this line.",
         "",
         "",
         "",
-        "  // Only change code above this line.",
+        "// Only change code above this line.",
+        "",
         "(function() {return array;})();"
       ],
       "challengeType": 1,
@@ -311,24 +350,29 @@
       "id": "cf1111c1c16feddfaeb3bdef",
       "title": "Concatenate Strings with .concat",
       "description": [
-        "<code>.concat()</code> can be used to merge the contents of two arrays into one.",
-        "<code>array = array.concat(otherArray);</code>"
+        "<code>concat</code> can be used to merge the contents of two arrays into one.",
+        "<code>concat</code> takes an array as an argument and returns a new array with the elements of this array concatenated onto the end.",
+        "Here is an example of <code>concat</code> being used to concatenate <code>otherArray</code> onto the end of <code>oldArray</code>:",
+        "<code>newArray = oldArray.concat(otherArray);</code>",
+        "Use <code>.concat()</code> to concatenate <code>concatMe</code> onto the end of <code>oldArray</code> and assign it to <code>newArray</code>."
       ],
       "tests": [
-        "assert.deepEqual(array, [1,2,3,4,5,6], 'You should concat the two arrays together.');",
-        "assert(editor.getValue().match(/\\.concat\\s*\\(/gi), 'message: You should be use the concat method to merge the two arrays.');",
-        "assert(editor.getValue().match(/\\[1\\,2\\,3\\]/gi) && editor.getValue().match(/\\[4\\,5\\,6\\]/gi), 'message: You should only modify the two arrays without changing the origional ones.');"
+        "assert.deepEqual(newArray, [1,2,3,4,5,6], 'message: You should concatenate the two arrays together.');",
+        "assert(editor.getValue().match(/\\.concat\\s*\\(/gi), 'message: You should be using the <code>concat</code> method to merge the two arrays.');",
+        "assert(editor.getValue().match(/\\[1\\,2\\,3\\]/gi) && editor.getValue().match(/\\[4\\,5\\,6\\]/gi), 'message: You should only be using <code>concat</code> to modify the arrays.');"
       ],
       "challengeSeed": [
-        "var array = [1,2,3];",
+        "var oldArray = [1,2,3];",
         "",
         "var concatMe = [4,5,6];",
+        "",
         "// Only change code below this line.",
         "",
-        "",
+        "var newArray = oldArray;",
         "",
         "// Only change code above this line.",
-        "(function() {return array;})();"
+        "",
+        "(function() { return newArray; })();"
       ],
       "challengeType": 1,
       "type": "waypoint"
@@ -336,23 +380,26 @@
     {
       "id":"cf1111c1c16feddfaeb4bdef",
       "title":"Split Strings with .split",
-      "difficulty":0,
       "description":[
-        "You can use the <code>.split()</code> method to split a string into an array.",
-        "split uses the argument you give to to split the string.",
-        "<code>array = string.split(' ');</code>"
+        "You can use the <code>split</code> method to split a string into an array.",
+        "<code>split</code> uses the argument you pass in as a delimiter to determine which points the string should be split at.",
+        "Here is an example of <code>split</code> being used to split an array at every <code>s</code> character:",
+        "<code>var array = string.split('s');</code>",
+        "Use <code>split</code> to create an array of words from <code>string</code> and assign it to <code>array</code>."
       ],
       "tests":[
-        "assert(typeof(array) === 'object' && array.length === 5, 'message: You should split the string by its spaces.');",
-        "assert(/\\.split\\(/gi, 'message: You should use the split method on the string.');"
+        "assert(/\\.split\\(/gi, 'message: You should use the <code>split</code> method on the string.');",
+        "assert(typeof(array) === 'object' && array.length === 5, 'message: You should split the string by its spaces.');"
       ],
       "challengeSeed":[
         "var string = \"Split me into an array\";",
+        "",
         "// Only change code below this line.",
         "",
         "var array = string;",
         "",
         "// Only change code above this line.",
+        "",
         "(function() {return array;})();"
       ],
       "challengeType":1,
@@ -361,23 +408,28 @@
     {
       "id":"cf1111c1c16feddfaeb5bdef",
       "title":"Join Strings with .join",
-      "difficulty":0,
       "description":[
-        "We can use the <code>.join()</code> method to join each element in an array into a string separated by whatever delimiter you provide as an argument to the join operation.",
-        "<code>var joinMe = joinMe.join(\" \");</code>"
+        "We can use the <code>join</code> method to join each element of an array into a string separated by whatever delimiter you provide as an argument.",
+        "The following is an example of using <code>join</code> to join all of the elements of an array into a string with all the elements seperated by word `Na`:",
+        "<code>var joinMe = [\"Na \", \"Na \", \"Na \", \"Na \", \"Batman!\"];</code>",
+        "<code>var joinedString = joinMe.join(\"Na \");</code>",
+        "<code>console.log(joinedString);</code>",
+        "Use the <code>join</code> method to create a string from <code>joinMe</code> with spaces in between each element and assign it to <code>joinedString</code>."
       ],
       "tests":[
-        "assert(typeof(joinMe) === 'string' && joinMe === \"Split me into an array\", 'message: You should join the arrays by their spaces.');",
-        "assert(/\\.join\\(/gi, 'message: You should use of the join method on the array.');"
+        "assert(typeof(joinedString) === 'string' && joinedString === \"Split me into an array\", 'message: You should join the elements of the array with spaces.');",
+        "assert(/\\.join\\(/gi, 'message: You should use of the <code>join</code> method on the array.');"
       ],
       "challengeSeed":[
         "var joinMe = [\"Split\",\"me\",\"into\",\"an\",\"array\"];",
+        "",
         "// Only change code below this line.",
         "",
-        "joinMe = joinMe;",
+        "var joinedString = joinMe;",
         "",
         "// Only change code above this line.",
-        "(function() {return joinMe;})();"
+        "",
+        "(function() {return joinedString;})();"
       ],
       "challengeType":1,
       "type": "waypoint"
diff --git a/seed/challenges/upper-intermediate-bonfires.json b/seed/challenges/upper-intermediate-bonfires.json
index c09cb30da4..b4ab210cd2 100644
--- a/seed/challenges/upper-intermediate-bonfires.json
+++ b/seed/challenges/upper-intermediate-bonfires.json
@@ -39,6 +39,9 @@
         "Closures",
         "Details of the Object Model"
       ],
+      "solutions": [
+        "var Person = function(firstAndLast) {\n\n  var firstName, lastName;\n\n  function updateName(str) {    \n    firstName = str.split(\" \")[0];\n    lastName = str.split(\" \")[1];    \n  }\n\n  updateName(firstAndLast);\n\n  this.getFirstName = function(){\n    return firstName;\n  };\n  \n  this.getLastName = function(){\n    return lastName;\n  };\n  \n  this.getFullName = function(){\n    return firstName + \" \" + lastName;\n  };\n  \n  this.setFirstName = function(str){\n    firstName = str;\n  };\n  \n\n  this.setLastName = function(str){\n    lastName = str;\n  };\n  \n  this.setFullName = function(str){\n    updateName(str);\n  };\n};\n\nvar bob = new Person('Bob Ross');\nbob.getFullName();"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -80,6 +83,9 @@
       "MDNlinks": [
         "Math.pow()"
       ],
+      "solutions": [
+        "function orbitalPeriod(arr) {\n  var GM = 398600.4418;\n  var earthRadius = 6367.4447;\n  var TAU = 2 * Math.PI; \n  return arr.map(function(obj) {\n    return {\n      name: obj.name,\n      orbitalPeriod: Math.round(TAU * Math.sqrt(Math.pow(obj.avgAlt+earthRadius, 3)/GM))\n    };\n  });\n}\n\norbitalPeriod([{name : \"sputkin\", avgAlt : 35873.5553}]);\n"
+      ],
       "type": "bonfire",
       "challengeType": 5,
       "nameCn": "",
@@ -120,6 +126,9 @@
         "Array.reduce()"
       ],
       "type": "bonfire",
+      "solutions": [
+        "function pairwise(arr, arg) {\n  var sum = 0;\n  arr.forEach(function(e, i, a) {\n    if (e != null) {      \n      var diff = arg-e;\n      a[i] = null;\n      var dix = a.indexOf(diff);\n      if (dix !== -1) {\n        sum += dix;\n        sum += i;\n        a[dix] = null;\n      }  \n    }\n  });\n  return sum;\n}\n\npairwise([1,4,2,3,0,5], 7);\n"
+      ],
       "challengeType": 5,
       "nameCn": "",
       "descriptionCn": [],
diff --git a/seed/index.js b/seed/index.js
index 464242c26e..8300b97245 100644
--- a/seed/index.js
+++ b/seed/index.js
@@ -1,55 +1,34 @@
 /* eslint-disable no-process-exit */
 require('babel/register');
 require('dotenv').load();
+
 var fs = require('fs'),
+    Rx = require('rx'),
     _ = require('lodash'),
     path = require('path'),
-    app = require('../server/server'),
-    nonprofits = require('./nonprofits.json'),
-    jobs = require('./jobs.json');
+    app = require('../server/server');
 
 function getFilesFor(dir) {
   return fs.readdirSync(path.join(__dirname, '/' + dir));
 }
 
 var Challenge = app.models.Challenge;
-var Nonprofit = app.models.Nonprofit;
-var Job = app.models.Job;
-var counter = 0;
 var challenges = getFilesFor('challenges');
-// plus two accounts for nonprofits and jobs seed.
-var numberToSave = challenges.length + 1;
+var destroy = Rx.Observable.fromNodeCallback(Challenge.destroyAll, Challenge);
+var create = Rx.Observable.fromNodeCallback(Challenge.create, Challenge);
 
-function completionMonitor() {
-  // Increment counter
-  counter++;
-
-  // Exit if all challenges have been checked
-  if (counter >= numberToSave) {
-    process.exit(0);
-  }
-
-  // Log where in the seed order we're currently at
-  console.log('Call: ' + counter + '/' + numberToSave);
-}
-
-Challenge.destroyAll(function(err, info) {
-  if (err) {
-    throw err;
-  } else {
-    console.log('Deleted ', info);
-  }
-  challenges.forEach(function(file) {
+destroy()
+  .flatMap(function() { return Rx.Observable.from(challenges); })
+  .flatMap(function(file) {
     var challengeSpec = require('./challenges/' + file);
     var order = challengeSpec.order;
     var block = challengeSpec.name;
     var isBeta = !!challengeSpec.isBeta;
+    console.log('parsed %s successfully', file);
 
     // challenge file has no challenges...
     if (challengeSpec.challenges.length === 0) {
-      console.log('file %s has no challenges', file);
-      completionMonitor();
-      return;
+      return Rx.Observable.just([{ block: 'empty ' + block }]);
     }
 
     var challenges = challengeSpec.challenges
@@ -73,50 +52,15 @@ Challenge.destroyAll(function(err, info) {
         return challenge;
       });
 
-    Challenge.create(
-      challenges,
-      function(err) {
-        if (err) {
-          throw err;
-        } else {
-          console.log('Successfully parsed %s', file);
-          completionMonitor(err);
-        }
-      }
-    );
-  });
-});
-
-Nonprofit.destroyAll(function(err, info) {
-  if (err) {
-    console.error(err);
-  } else {
-    console.log('Deleted ', info);
-  }
-  Nonprofit.create(nonprofits, function(err, data) {
-    if (err) {
-      throw err;
-    } else {
-      console.log('Saved ', data);
+    return create(challenges);
+  })
+  .subscribe(
+    function(challenges) {
+      console.log('%s successfully saved', challenges[0].block);
+    },
+    function(err) { throw err; },
+    function() {
+      console.log('challenge seed completed');
+      process.exit(0);
     }
-    completionMonitor(err);
-    console.log('nonprofits');
-  });
-});
-
-Job.destroyAll(function(err, info) {
-  if (err) {
-    throw err;
-  } else {
-    console.log('Deleted ', info);
-  }
-  Job.create(jobs, function(err, data) {
-    if (err) {
-      console.log('error: ', err);
-    } else {
-      console.log('Saved ', data);
-    }
-    console.log('jobs');
-    completionMonitor(err);
-  });
-});
+  );
diff --git a/seed/nonprofits.js b/seed/nonprofits.js
new file mode 100644
index 0000000000..96ed0ba5c9
--- /dev/null
+++ b/seed/nonprofits.js
@@ -0,0 +1,29 @@
+/* eslint-disable no-process-exit */
+require('babel/register');
+require('dotenv').load();
+
+var Rx = require('rx');
+var app = require('../server/server');
+
+var Nonprofits = app.models.Nonprofit;
+var nonprofits = require('./nonprofits.json');
+var destroy = Rx.Observable.fromNodeCallback(Nonprofits.destroyAll, Nonprofits);
+var create = Rx.Observable.fromNodeCallback(Nonprofits.create, Nonprofits);
+
+destroy()
+  .flatMap(function() {
+    if (!nonprofits) {
+      return Rx.Observable.throw(new Error('No nonprofits found'));
+    }
+    return create(nonprofits);
+  })
+  .subscribe(
+    function(nonprofits) {
+      console.log('successfully saved %d nonprofits', nonprofits.length);
+    },
+    function(err) { throw err; },
+    function() {
+      console.log('nonprofit seed completed');
+      process.exit(0);
+    }
+  );
diff --git a/seed/nonprofits.json b/seed/nonprofits.json
index d7b86cf9e9..2f6ee0b77d 100644
--- a/seed/nonprofits.json
+++ b/seed/nonprofits.json
@@ -1,6 +1,5 @@
 [
   {
-    "id": "bd7157d8c441cbafaeb5bdef",
     "whatDoesNonprofitDo": "We help the many less-fortunate Jewish families in our community, by providing them with nutritious food and energy to grow, learn, work, and give them hope for a better and brighter future.",
     "websiteLink": "http://chasdeikaduri.org/",
     "name": "Chasdei Kaduri",
@@ -13,14 +12,13 @@
       "form"
     ],
     "projectDescription": "Campers will create a system will integrate the food inventory, donor and delivery driver management systems as well as replace the current application system with a custom form solution. System will include a more streamlined operations management, with user printable lists of inventory, drivers, and deliveries.",
-    "logoUrl": "https://trello-attachments.s3.amazonaws.com/54c7e02f2c173c37015b2f36/604x309/00580a0567a4b3afda29d52b09e7e829/rQQ6zwq31Uya8ie9QHC-MlvfXxqftm9UPPe524JUhmwSEaZjQ7oL7U1tVoHLUj-gVUwM-7uzBGFsAXD_A_cx_JyAZP4Td-GMBJ-AebJNRAQP0m0v253eKMkURp63aG4%3Ds0-d-e1-ft.png",
-    "imageUrl": "https://pbs.twimg.com/media/B3d6B8PIYAAa6QL.jpg",
+    "logoUrl": "http://i.imgur.com/zQiM0P8.png",
+    "imageUrl": "http://i.imgur.com/xeRdA87.jpg",
     "estimatedHours": 300,
     "currentStatus": "completed",
     "moneySaved": 60000
   },
   {
-    "id": "bd7158d8c464cbafaeb4bdef",
     "whatDoesNonprofitDo": "We connect simple technology with last mile communities to reduce poverty.",
     "websiteLink": "http://kopernik.info/",
     "name": "Kopernik",
@@ -29,14 +27,13 @@
       "other"
     ],
     "projectDescription": "Campers will create a Chrome browser extension to preserve sales data from a form, and upload in batches as the internet connection allows.",
-    "logoUrl": "https://trello-attachments.s3.amazonaws.com/54d29f1e4c726fd765fa87ef/54d29f6388812dd367a243ab/x/018d9d3be5439870c56cccba5b3aa8bf/kopernik-logo-global.png",
-    "imageUrl": "http://kopernik.info/sites/default/files/updates/Presenting_the_low_carbon_t.jpg",
+    "logoUrl": "http://i.imgur.com/xTqjIkC.png",
+    "imageUrl": "http://i.imgur.com/xBAUJSa.jpg",
     "estimatedHours": 100,
     "currentStatus": "completed",
     "moneySaved": 20000
   },
   {
-    "id": "bd1326d9c245cbafaeb4bdef",
     "whatDoesNonprofitDo": "We distribute biodegradable toothbrushes globally to children in need.",
     "websiteLink": "http://www.operationbrush.org/",
     "name": "Operation Brush",
@@ -45,14 +42,13 @@
       "website"
     ],
     "projectDescription": "Campers will create a mobile responsive website for the organization, with donation capabilities.",
-    "logoUrl": "https://trello-attachments.s3.amazonaws.com/54d9810307b159a4d9027aa2/54d981bfe5eb145560fbb769/x/cf7f318bfe4aee631b0d0eeef272225c/logo.png",
-    "imageUrl": "http://www.operationbrush.org/images/temp/hands1.png",
+    "logoUrl": "http://i.imgur.com/DEDhImE.png",
+    "imageUrl": "http://i.imgur.com/RuA9Rgy.jpg",
     "estimatedHours": 100,
     "currentStatus": "completed",
     "moneySaved": 20000
   },
   {
-    "id": "bd1325d8c464cbafaeb5bdef",
     "whatDoesNonprofitDo": "We are the largest roller derby league in the world with around 250 adults and 150 junior skater members plus 500+ volunteers.",
     "websiteLink": "http://www.rosecityrollers.com/about/our-charities/",
     "name": "Rose City Rollers",
@@ -61,14 +57,13 @@
       "community"
     ],
     "projectDescription": "Campers will create a volunteer management system with multi-user access and reporting capabilities.",
-    "logoUrl": "https://trello-attachments.s3.amazonaws.com/54c1daf2d72d8eb868910b60/54c1dd4ecffcb09fc52b68a1/x/a8148f08769b449217e433bab8f39ddd/RCR-color.jpg",
-    "imageUrl": "http://www.rosecityrollers.com/wp-content/uploads/2015/01/BZ7_5923-X3-675x375.jpg",
+    "logoUrl": "http://i.imgur.com/ZZAZSs4.jpg",
+    "imageUrl": "http://i.imgur.com/WKS4cZ8.jpg",
     "estimatedHours": 200,
-    "currentStatus": "started",
+    "currentStatus": "completed",
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb6bde1",
     "whatDoesNonprofitDo": "We provide urgently needed pediatric heart surgery and follow-up care for indigent children from developing countries",
     "websiteLink": "http://www.saveachildsheart.com/global/young-leadership-program/",
     "name": "Save a Child's Heart",
@@ -77,14 +72,13 @@
       "website"
     ],
     "projectDescription": "Campers will create a single page fundraising website. In exchange for a donation, a user can customize a graphical 'heart' in someone's name or anonymously. The page will display all of the hearts on a 'wall of hearts.'",
-    "logoUrl": "https://trello-attachments.s3.amazonaws.com/548b36629137780091a973cc/666x666/6c7a366ffb659649f6377d4a431687cd/country-logos-1-300dpi.jpg",
-    "imageUrl": "http://www.saveachildsheart.com/wp-content/uploads/2013/10/7.2.5_Internation_Photograohy_Exhibition.jpg",
+    "logoUrl": "http://i.imgur.com/t6tpiEW.jpg",
+    "imageUrl": "http://i.imgur.com/xqhvdn2.jpg",
     "estimatedHours": 200,
     "currentStatus": "completed",
     "moneySaved": 40000
   },
   {
-    "id": "bd1225d8c464cbafaeb4bdef",
     "whatDoesNonprofitDo": "We empower youth with technology by providing age appropriate resources and education.",
     "websiteLink": "http://savvycyberkids.org/",
     "name": "Savvy Cyber Kids",
@@ -93,14 +87,13 @@
       "website"
     ],
     "projectDescription": "Campers will create a website where potential donors can view which schools already have the Savvy Cyber Kids books, and donate books to those schools that do not.",
-    "logoUrl": "https://trello-attachments.s3.amazonaws.com/54ee3c7bf205562680177b59/218x190/1dc460de4edc9fdd4b481b24e93cfb23/logo.png",
-    "imageUrl": "http://www.privatewifi.com/wp-content/uploads/2014/10/Halpert.jpg",
+    "logoUrl": "http://i.imgur.com/JgxYVJ5.png",
+    "imageUrl": "http://i.imgur.com/ZTg12ao.jpg",
     "estimatedHours": 200,
-    "currentStatus": "started",
+    "currentStatus": "completed",
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb7bcef",
     "whatDoesNonprofitDo": "We bring a new edge to arts and medicine in the Bay Area through powerful live performances of new music to those who feel marginalized by their affliction.",
     "websiteLink": "http://transcendentpathways.org/",
     "name": "Transcendent Pathways",
@@ -109,15 +102,14 @@
       "other"
     ],
     "projectDescription": "Campers will build a website where medical facilities can list music therapy time slots, and musicians can sign up to fill these slots.",
-    "logoUrl": "http://static1.squarespace.com/static/521b8957e4b024f66a58b214/t/521b8e9de4b093a8696eb9b8/1398718364447/?format=750w",
-    "imageUrl": "https://trello-attachments.s3.amazonaws.com/54fdb0328917ca64e9e8a79f/54fdc3b710f67caf6da14719/x/49fbe0012179bf254928f3f2a44810b4/Screen_2BShot_2B2013-08-26_2Bat_2B1.32.35_2BPM.png",
+    "logoUrl": "http://i.imgur.com/JV4rcKX.png",
+    "imageUrl": "http://i.imgur.com/gyhrPee.jpg",
     "estimatedHours": 200,
-    "currentStatus": "started",
+    "currentStatus": "completed",
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb8bdef",
-    "whatDoesNonprofitDo": "We have provide volunteer matching fairs and silent art auctions at events across Canada. Rather than bid money on artwork, participants bid volunteer hours.",
+     "whatDoesNonprofitDo": "We have provide volunteer matching fairs and silent art auctions at events across Canada. Rather than bid money on artwork, participants bid volunteer hours.",
     "websiteLink": "http://www.timeraiser.ca/",
     "name": "Timeraiser",
     "endUser": "Working professionals who want to donate their time and expertise",
@@ -125,14 +117,13 @@
       "other"
     ],
     "projectDescription": "Campers will build a mobile responsive web form to allow Timeraiser eventgoers to select which nonprofit organizations they're interested in volunteering with. System will have Salesforce integration and reporting capabilities.",
-    "logoUrl": "http://www.timeraiser.ca/uploads/5/6/1/4/5614163/1277176.png?480",
-    "imageUrl": "http://www.timeraiser.ca/uploads/5/6/1/4/5614163/______________4571248_orig.png",
+    "logoUrl": "http://i.imgur.com/USK8ld7.png",
+    "imageUrl": "http://i.imgur.com/7apWppe.jpg",
     "estimatedHours": 200,
     "currentStatus": "completed",
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb7bdef",
     "whatDoesNonprofitDo": "We focus on raising funds to assist injured homeless animals.",
     "websiteLink": "http://www.peoplesavinganimals.org/",
     "name": "People Saving Animals",
@@ -143,14 +134,13 @@
       "form"
     ],
     "projectDescription": "Campers will build an adoption database and all related web interfaces and forms to allow animal shelters to easily post animals, photos, and relevant medical information. They'll make it easy for locals to browse these animals and adopt them. Once completed, this project will be translated into Spanish.",
-    "logoUrl": "https://scontent-sjc2-1.xx.fbcdn.net/hphotos-xfa1/v/t1.0-9/59709_501505959886494_1605714757_n.jpg?oh=e12c08c046d824765a02242b7c8c3bb5&oe=560CFA6A",
-    "imageUrl": "https://scontent-sjc2-1.xx.fbcdn.net/hphotos-xta1/t31.0-8/11270516_844556088914811_757350153964826829_o.jpg",
+    "logoUrl": "http://i.imgur.com/iKcKcpg.jpg",
+    "imageUrl": "http://i.imgur.com/b9ZeU7R.jpg",
     "estimatedHours": 300,
-    "currentStatus": "started",
+    "currentStatus": "completed",
     "moneySaved": 60000
   },
   {
-    "id": "bd1325d8c464cbafaeb6bde2",
     "whatDoesNonprofitDo": "We preserve Florida's health by regulating septic contractors and reviewing logs of sewage collection and disposal.",
     "websiteLink": "http://www.floridahealth.gov/",
     "name": "Florida Department of Health",
@@ -161,15 +151,14 @@
       "other"
     ],
     "projectDescription": "Campers will build mobile responsive web forms to allow contractors to seamlessly log the chain of custody for potentially hazardous sewage. They'll also build a government-facing database that allows for easy monitoring and reporting of activity.",
-    "logoUrl": "http://www.floridahealth.gov/_new/_files/images/DOH_logo.png",
-    "imageUrl": "http://www.dep.state.fl.us/central/Home/Watershed/Home.jpg",
+    "logoUrl": "http://i.imgur.com/J3Scbsp.png",
+    "imageUrl": "http://i.imgur.com/8LEFrKy.jpg",
     "estimatedHours": 200,
-    "currentStatus": "started",
+    "currentStatus": "completed",
     "moneySaved": 40000
   },
   {
-    "id": "bd1325d8c464cbafaeb6bde3",
-    "whatDoesNonprofitDo": "We strengthen the value of songwriting and independent music in Columbus, Ohio.",
+     "whatDoesNonprofitDo": "We strengthen the value of songwriting and independent music in Columbus, Ohio.",
     "websiteLink": "http://columbussongwritersassociation.com",
     "name": "Columbus Songwriters Association",
     "endUser": "Songwriters and their audiences in the Columbus, Ohio community.",
@@ -177,14 +166,13 @@
       "website"
     ],
     "projectDescription": "Build mobile responsive website that allows users to see browse our partners, their photos and information, and connect with them.",
-    "logoUrl": "https://columbussongwritersassociation.files.wordpress.com/2014/06/csa-logo.jpeg?w=705&h=435&crop=1",
-    "imageUrl": "https://columbussongwritersassociation.files.wordpress.com/2015/03/10502364_918551148225410_5082247612691070613_n.jpg?w=705&h=344&crop=1",
+    "logoUrl": "http://i.imgur.com/UN85TI4.jpg",
+    "imageUrl": "http://i.imgur.com/NFxL1oS.jpg",
     "estimatedHours": 100,
     "currentStatus": "completed",
     "moneySaved": 20000
   },
   {
-    "id": "bd1325d8c464cbafaeb4bbb",
     "whatDoesNonprofitDo": "We leverage all the benefits of cycling to support and improve the lives of youth and teens in the Triangle region.",
     "websiteLink": "http://www.trianglebikeworks.org",
     "name": "Triangle Bike Works",
@@ -200,7 +188,6 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4bccc",
     "whatDoesNonprofitDo": "We work to eradicate female genital mutilation in the US and Gambia. We work with survivors and communities.",
     "websiteLink": "http://safehandsforgirls.org/",
     "name": "Safe Hands for Girls",
@@ -216,7 +203,6 @@
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4beff",
     "whatDoesNonprofitDo": "We're a part of the Department of Psychiatry at Mass General Hospital. We teach an innovative way for helping people that have challenging behaviors.",
     "websiteLink": "http://www.thinkkids.org/",
     "name": "Think Kids at Massachusetts General Hospital",
@@ -225,14 +211,13 @@
       "volunteer"
     ],
     "projectDescription": "We would like help developing a simple online based portal for both our trainees and trainers where we can store and share documents, track their progress, and incorporate a blackboard/chat forum.",
-    "logoUrl": "http://www.thinkkids.org/wp-content/themes/think-kids/images/logo.png",
+    "logoUrl": "http://i.imgur.com/fu6dTmH.png",
     "imageUrl": "http://i.imgur.com/hiGJms5.png",
     "estimatedHours": 300,
-    "currentStatus": "open",
+    "currentStatus": "started",
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbaeaeb4bdef",
     "whatDoesNonprofitDo": "We enable, educate, and empower students from rural backgrounds in Uttar Pradesh, India.",
     "websiteLink": "http://www.milaan.in/",
     "name": "Milaan",
@@ -242,13 +227,12 @@
     ],
     "projectDescription": "Campers will build a basic website for the US operations of Milaan. ",
     "logoUrl": "http://i.imgur.com/GLq1qqD.png",
-    "imageUrl": "http://www.milaan.in/wp-content/uploads/2014/07/IMG_2624-e1432218749722.jpg",
+    "imageUrl": "http://i.imgur.com/PkMHQ8N.jpg",
     "estimatedHours": 100,
     "currentStatus": "open",
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4beee",
     "whatDoesNonprofitDo": "We're committed to closing the opportunity gap for children in Baltimore City by providing high quality after school and in-school programs.",
     "websiteLink": "http://childfirstauthority.org/",
     "name": "Child First Authority",
@@ -258,58 +242,39 @@
     ],
     "projectDescription": "Campers will build a dynamic database that will allow 7 community school coordinators to (1) input student-level absenteeism data, (2) code and track outreach efforts, (3) code root causes for absenteeism, and (4) track trends in each area. Currently, Child First uses an unwieldy excel spreadsheet to do this.",
     "logoUrl": "http://i.imgur.com/YlPsQmN.jpg",
-    "imageUrl": "http://childfirstauthority.org/wp-content/uploads/2012/09/CFAHEADER7.gif",
+    "imageUrl": "http://i.imgur.com/Z2RfQku.gifv",
     "estimatedHours": 200,
-    "currentStatus": "open",
+    "currentStatus": "started",
     "moneySaved": 0
   },
   {
-    "id": "bd1325d8c464cbafaeb4bdef",
-    "whatDoesNonprofitDo": "SOLACE Foundation provides drug overdose prevention and awareness training as well as grief support for bereaved families.",
-    "websiteLink": "https://www.facebook.com/www.solaceorangecounty.org",
-    "name": "The Solace Foundation of Orange County",
-    "endUser": "Donors",
-    "approvedDeliverables": ["Website"],
-    "projectDescription": "Campers will build a basic website that accepts donations.",
-    "logoUrl": "http://i.imgur.com/79E3nP0.png",
-    "imageUrl": "http://i.imgur.com/kCWN1iT.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
-    "estimatedHours": 100
-  },
-  {
-    "id": "bd1325d8c463cbafaeb4bdef",
     "whatDoesNonprofitDo": "We are an interdisciplinary team that works towards harmony among humans and nature through three distinct branches: sustainable agriculture, environmental education and applied and appropriate technology; focused in Líbano, Tolima, Colombia.",
-    "websiteLink": "string",
+    "websiteLink": "",
     "name": "QET America",
     "endUser": "Donors",
     "approvedDeliverables": ["Website"],
     "projectDescription": "Campers will build a multiple language website (English, Spanish) that accepts donations.",
     "logoUrl": "http://i.imgur.com/jPuiPOy.jpg",
     "imageUrl": "http://i.imgur.com/zaaL2pj.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
-    "estimatedHours": 100
+    "estimatedHours": 100,
+    "currentStatus": "open",
+    "moneySaved": 0
   },
   {
-    "id": "bd1325d8c462cbafaeb4bdef",
     "whatDoesNonprofitDo": "1to1 Movement provides free environmental education in schools",
     "websiteLink": "http://1to1movement.org/",
-    "stakeholderName": "string",
-    "stakeholderEmail": "string",
     "name": "1 to 1 Movement",
     "endUser": "Pledgers",
     "approvedDeliverables": ["Web App"],
     "projectDescription": "Campers will build a simple, social, data-driven application that allows people to see the impact of their actions. User can make a pledge and track the outcome. Will make use of the D3.js visualization library.",
     "logoUrl": "http://i.imgur.com/jaqxg0O.png",
     "imageUrl": "http://i.imgur.com/GXSWTZw.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
-    "estimatedHours": 300
+    "estimatedHours": 300,
+    "currentStatus": "open",
+    "moneySaved": 0
   },
 
   {
-    "id": "bd1325d8c464cbcfaeb4bdef",
     "whatDoesNonprofitDo": "Our missions is to elevate the national dialogue and engage the American people around climate change policy and the promotion of real clean energy solutions in the United States.",
     "websiteLink": "http://www.usclimateplan.org/",
     "name": "US Climate Plan",
@@ -318,24 +283,47 @@
     "projectDescription": "Campers will build a basic website for sharing information, feeds from different campaign’s websites.",
     "logoUrl": "http://i.imgur.com/uAyUiMN.png",
     "imageUrl": "http://i.imgur.com/2Og5tqy.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
-    "estimatedHours": 100
+    "estimatedHours": 100,
+    "currentStatus": "open",
+    "moneySaved": 0
   },
   {
-    "id": "bd1325d8c461cbafaeb4bdef",
     "whatDoesNonprofitDo": "We empower the community through improved literacy.",
     "websiteLink": "http://www.tleliteracy.com/",
-    "stakeholderName": "Darlene Brown",
-    "stakeholderEmail": "string",
     "name": "The Learning Exchange",
-    "endUser": "string",
+    "endUser": "Community members",
     "approvedDeliverables": ["Website"],
     "projectDescription": "Campers will build a simple website to replace essentialskillsquebec.com. Site will host many documents related to the Nine Essential Skills.",
     "logoUrl": "http://i.imgur.com/jXQY01H.png",
     "imageUrl": "http://i.imgur.com/iUXBpeL.jpg",
-    "interestedCampers": [],
-    "confirmedCampers": [],
-    "estimatedHours": 100
+    "estimatedHours": 100,
+    "currentStatus": "started",
+    "moneySaved": 0
+  },
+  {
+    "whatDoesNonprofitDo": "Options Inc. is an organization that was founded in 1979 to assist adults with disabilities in living and working in the community. We provide transportation to approximately 230 individuals.",
+    "websiteLink": "www.options-inc.org",
+    "name": "Options Inc.",
+    "endUser": "Administrators and Persons with Disabilities",
+    "approvedDeliverables": ["Web App"],
+    "projectDescription": "Campers will build a system to store all of Options Inc.'s clients addresses, optimize routes for our 23 vehicles, and schedule their staff for these routes.",
+    "logoUrl": "http://i.imgur.com/jGWRMuF.jpg",
+    "imageUrl": "http://i.imgur.com/VUuJJlM.jpg",
+    "estimatedHours": 300,
+    "currentStatus": "open",
+    "moneySaved": 0
+  },
+  {
+    "whatDoesNonprofitDo": "Our goal is to improve addiction treatment and recovery services through targeted outreach, policy development, and direct support services for addicts, their families and health professionals.",
+    "websiteLink": "http://www.taadas.org/",
+    "name": "Tennessee Association of Alcohol Drug and other Addiction Services",
+    "endUser": "Administrators and Persons with Disabilities",
+    "approvedDeliverables": ["Website"],
+    "projectDescription": "Campers will build a modern, mobile-responsive website.",
+    "logoUrl": "http://i.imgur.com/kYHgY0F.jpg",
+    "imageUrl": "http://i.imgur.com/W6L1sGV.jpg",
+    "estimatedHours": 100,
+    "currentStatus": "open",
+    "moneySaved": 0
   }
 ]
diff --git a/seed/under-construction/json-apis-and-ajax.json b/seed/under-construction/json-apis-and-ajax.json
deleted file mode 100644
index f45e7178ba..0000000000
--- a/seed/under-construction/json-apis-and-ajax.json
+++ /dev/null
@@ -1,522 +0,0 @@
-{
-  "name": "JSON APIs and Ajax",
-  "order": 0.0065,
-  "challenges": [
-    {
-      "id": "bad87fed1348bd9aeca08826",
-      "title":  "Trigger on click Events with jQuery",
-      "description": [
-        "With jQuery we are able to get data from APIs via Ajax",
-        "This data normally comes in the form of JSON",
-        "Let's get the <code>Get Message</code> button to set the text of a div",
-        "We will later use this to display the result of out API request",
-        "<code>$(\"#getMessage\").on(\"click\", function(){</code>",
-        "<code>&thinsp;&thinsp;$(\".message\").html(\"Here is the message\");</code>",
-        "<code>});</code>"
-      ],
-      "tests": [
-        "assert(editor.match(/\\$\\(\\s?\\\"\\#getMessage\\\"\\s?\\)\\.on\\s?\\(\\s?\\\"click\\\"\\,\\s?function\\s?\\(\\)\\s?\\{/gi), 'You should have bound the click event to the getMessage button')",
-        "assert(editor.match(/\\$\\(\\s?\\\"\\.message\\\"\\s?\\)\\.html\\(\\s?\\\"Here\\sis\\sthe\\smessage\\\"\\s?\\);/gi), 'You should set te value of the #message box to be the message given in the description')",
-        "assert(editor.match(/\\}\\);/gi) && editor.match(/\\}\\);/gi).length >= 2, 'Make sure that you close off all of your functions')"
-      ],
-      "challengeSeed": [
-        "fccss",
-        "  $(document).ready(function() {",
-        "    ",
-        "  });",
-        "fcces",
-        "",
-        "<!-- You shouldn't need to modify code below this line -->",
-        "",
-        "<div class=\"container-fluid\">",
-        " <div class = \"row text-center\">",
-        "   <h2>Cat Photo Finder</h2>",
-        " </div>",
-        " <br/>",
-        " <div class = \"row text-center\">",
-        "   <div class = \"col-xs-12 well Message\">",
-        "     The message will go here",
-        "   </div>",
-        " </div>",
-        " <br/>",
-        " <div class = \"row text-center\">",
-        "   <div class = \"col-xs-12\">",
-        "     <button id = \"getMessage\" class = \"btn btn-primary\">",
-        "       Get Message",
-        "     </button>",
-        "   </div>",
-        " </div>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-    {
-      "id": "bad87fee1348bd9aebc08726",
-      "title": "Learn JSON Syntax",
-      "description": [
-        "JSON stands for \"JavaScript Object Notation\". It\"s how you create objects in JavaScript.",
-        "JSON is a series of \"key-value pairs\". Everything on the left of the colon (<code>:</code>) is the \"key\" you use to unlock the \"value\" on the right of the colon."
-      ],
-      "tests": [
-        "assert(typeof data != \"undefined\", \"Whoops! It looks like you deleted the <code>data</code> variable!\");",
-        "assert(typeof getAnId != \"undefined\", \"Whoops! It looks like you deleted the <code>getAnId</code> function!\");",
-        "assert(data[0]['id'] === getAnId(), \"The duntion getFirstId should return the id of the first element in the array\");"
-      ],
-      "challengeSeed": [
-        "fccss",
-        "var data = [",
-        "  {",
-        "    \"id\": 0,",
-        "    \"imageLink\": \"http://rs611.pbsrc.com/albums/tt194/allypopper423/Funny-Cat-Green-Avacado.jpg~c200\",",
-        "    \"codeNames\": [",
-        "      \"Juggernaut\",",
-        "      \"Mrs. Wallace\",",
-        "      \"Buttercup\"",
-        "    ]",
-        "  },",
-        "  {",
-        "    \"id\": 1,",
-        "    \"imageLink\": \"http://cdn.grumpycats.com/wp-content/uploads/2012/09/GC-Gravatar-copy.png\",",
-        "    \"codeNames\": [",
-        "      \"Oscar\",",
-        "      \"Scrooge\",",
-        "      \"Tyrion\"",
-        "    ]",
-        "  },",
-        "  {",
-        "    \"id\": 2,",
-        "    \"imageLink\": \"http://www.kittenspet.com/wp-content/uploads/2012/08/cat_with_funny_face_3-200x200.jpg\",",
-        "    \"codeNames\": [",
-        "      \"The Doctor\",",
-        "      \"Loki\",",
-        "      \"Joker\"",
-        "    ]",
-        "  }",
-        "]",
-        "function getAnId(){",
-        "  return();",
-        "}",
-        "fcces"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-    {
-      "id": "bad87fee1348bd9aeca08826",
-      "title":  "Displaying JSON data in HTML",
-      "description": [
-        "JSON stands for \"JavaScript Object Notation\". It\"s how you create objects in JavaScript.",
-        "JSON is a series of \"key-value pairs\". Everything on the left of the colon (<code>:</code>) is the \"key\" you use to unlock the \"value\" on the right of the colon."
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "fccss",
-        "  $(document).ready(function() {",
-        "    $(\"#getMessage\").on(\"click\", function(){",
-        "      $(\".message\").html(\"Here is the message\");",
-        "    });",
-        "  });",
-        "fcces",
-        "",
-        "<!-- You shouldn't need to modify code below this line -->",
-        "",
-        "<div class=\"container-fluid\">",
-        " <div class = \"row text-center\">",
-        "   <h2>Cat Photo Finder</h2>",
-        " </div>",
-        " <br/>",
-        " <div class = \"row text-center\">",
-        "   <div class = \"col-xs-12 well Message\">",
-        "     The message will go here",
-        "   </div>",
-        " </div>",
-        " <br/>",
-        " <div class = \"row text-center\">",
-        "   <div class = \"col-xs-12\">",
-        "     <button id = \"getMessage\" class = \"btn btn-primary\">",
-        "       Get Message",
-        "     </button>",
-        "   </div>",
-        " </div>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
-    {
-      "id": "bad84fee1348bd9aecc48826",
-      "title": "Read Data from an Element Using jQuery",
-      "dashedName":  "waypoint-read-data-from-an-element-using-jquery",
-      "description": [
-        "Let's make everything roll with <code>rollOut</code>."
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "fccss",
-        "  $(document).ready(function() {",
-        "    $(\"button\").on(\"click\", function() {",
-        "      $(\"#click-me\").addClass(\"animated shake\");",
-        "    });",
-        "  });",
-        "fcces",
-        "",
-        "<!-- You shouldn't need to modify code below this line -->",
-        "",
-        "<div class=\"container-fluid\">",
-        "  <div class=\"row\">",
-        "    <div class=\"col-xs-2\">",
-        "      <input type=\"checkbox\" id=\"check-me\">",
-        "    </div>",
-        "    <div class=\"col-xs-10\">",
-        "      <p>#check-me</p>",
-        "    </div>",
-        "  <button class=\"btn btn-block btn-primary\">#click-me</button>",
-        "  <span>Is the checkbox checked?</span>",
-        "  <span id=\"checked-state\"></span>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
-    {
-      "id": "bad84fee1348bd9aecc38826",
-      "title": "Read Data from an Element Using jQuery",
-      "dashedName":  "waypoint-read-data-from-an-element-using-jquery",
-      "description": [
-        "Let's make everything roll with <code>rollOut</code>."
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "fccss",
-        "  $(document).ready(function() {",
-        "    $(\"button\").on(\"click\", function() {",
-        "      $(\"#click-me\").addClass(\"animated shake\");",
-        "      $(\"#checked-state\").text(\"happy text\");",
-        "    });",
-        "  });",
-        "fcces",
-        "",
-        "<!-- You shouldn't need to modify code below this line -->",
-        "",
-        "<div class=\"container-fluid\">",
-        "  <div class=\"row\">",
-        "    <div class=\"col-xs-2\">",
-        "      <input type=\"checkbox\" id=\"check-me\">",
-        "    </div>",
-        "    <div class=\"col-xs-10\">",
-        "      <p>#check-me</p>",
-        "    </div>",
-        "  <button class=\"btn btn-block btn-primary\">#click-me</button>",
-        "  <span>Is the checkbox checked?</span>",
-        "  <span id=\"checked-state\"></span>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
-    {
-      "id": "bad84fee1348bd9aecc28826",
-      "title": "Read Data from an Element Using jQuery",
-      "dashedName":  "waypoint-read-data-from-an-element-using-jquery",
-      "description": [
-        "Let's make everything roll with <code>rollOut</code>."
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "fccss",
-        "  $(document).ready(function() {",
-        "    $(\"button\").on(\"click\", function() {",
-        "      $(\"#click-me\").addClass(\"animated shake\");",
-        "      $(\"#checked-state\").text($(\"#check-me\").prop(\"checked\"));",
-        "    });",
-        "  });",
-        "fcces",
-        "",
-        "<!-- You shouldn't need to modify code below this line -->",
-        "",
-        "<div class=\"container-fluid\">",
-        "  <div class=\"row\">",
-        "    <div class=\"col-xs-2\">",
-        "      <input type=\"checkbox\" id=\"check-me\">",
-        "    </div>",
-        "    <div class=\"col-xs-10\">",
-        "      <p>#check-me</p>",
-        "    </div>",
-        "  <button class=\"btn btn-block btn-primary\">#click-me</button>",
-        "  <span>Is the checkbox checked?</span>",
-        "  <span id=\"checked-state\"></span>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
-    {
-      "id": "bad84fee1348bd9aecc18826",
-      "title": "Read Data from an Element Using jQuery",
-      "dashedName":  "waypoint-read-data-from-an-element-using-jquery",
-      "description": [
-
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "fccss",
-        "  $(document).ready(function() {",
-        "    $(\"button\").on(\"click\", function() {",
-        "      $(\"#click-me\").addClass(\"animated shake\");",
-        "      $(\"#checked-state\").text($(\"#check-me\").prop(\"checked\"));",
-        "    });",
-        "  });",
-        "fcces",
-        "",
-        "<!-- You shouldn't need to modify code below this line -->",
-        "",
-        "<div class=\"container-fluid\">",
-        "  <div class=\"row\">",
-        "    <div class=\"col-xs-2\">",
-        "      <input type=\"checkbox\" id=\"check-me\">",
-        "    </div>",
-        "    <div class=\"col-xs-10\">",
-        "      <p>#check-me</p>",
-        "    </div>",
-        "  <button class=\"btn btn-block btn-primary\">#click-me</button>",
-        "  <span>Is the checkbox checked?</span>",
-        "  <span id=\"checked-state\"></span>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
-    {
-      "id": "bad87fee1348bd9aecc08826",
-      "title": "Trigger onHover Events with jQuery",
-      "dashedName":  "waypoint-trigger-onhover-events-with-jquery",
-      "description": [
-
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
-    {
-      "id": "bad87fee1348bd9aebc08826",
-      "title": "Get Data from an URL Using jQuery",
-      "dashedName":  "waypoint-get-data-from-a-url-using-jquery",
-      "description": [
-
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "fccss",
-        "",
-        "  $(document).ready(function() {",
-        "",
-        "    $(\"#cat-button\").on(\"click\", function() {",
-        "      $.getJSON(\"/json/cats.json\", function( json ) {",
-        "",
-        "      });",
-        "    });",
-        "",
-        "  });",
-        "fcces",
-        "<div class=\"container-fluid\">",
-        "  <button id=\"cat-button\" class=\"btn btn-primary btn-block btn-lg\">#cat-button</button>",
-        "  <div class=\"jumbotron\" id=\"output\">",
-        "  </div>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
-    {
-      "id": "bad87fee1348bd9ae9c08826",
-      "title": "Loop through JSON Data Using jQuery",
-      "dashedName":  "waypoint-loop-through-json-data-using-jquery",
-      "description": [
-
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "fccss",
-        "",
-        "  $(document).ready(function() {",
-        "",
-        "    $(\"#cat-button\").on(\"click\", function() {",
-        "      $.getJSON(\"/json/cats.json\", function( json ) {",
-        "",
-        "      });",
-        "    });",
-        "",
-        "  });",
-        "fcces",
-        "<div class=\"container-fluid\">",
-        "  <button id=\"cat-button\" class=\"btn btn-primary btn-block btn-lg\">#cat-button</button>",
-        "  <div class=\"jumbotron\" id=\"output\">",
-        "  </div>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
-    {
-      "id": "bad88fee1348bd9ae8c08726",
-      "title": "Wire AJAX Call into a jQuery Click Event",
-      "dashedName":  "waypoint-wire-ajax-call-into-a-jquery-click-event",
-      "description": [
-        "<img src=\"https://www.evernote.com/l/AjmAQ5BxGrFGRrWl_j2eSpGZMfrunfse89gB/image.png\">"
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "fccss",
-        "  var random = function() { return Math.floor(Math.random() * 3) }",
-        "  $(document).ready(function() {",
-        "",
-        "    $(\"#cat-button\").on(\"click\", function() {",
-        "      $.getJSON(\"/json/cats.json\", function( json ) {",
-        "",
-        "      });",
-        "    });",
-        "",
-        "  });",
-        "fcces",
-        "<div class=\"container-fluid\">",
-        "  <button id=\"cat-button\" class=\"btn btn-primary btn-block btn-lg\">#cat-button</button>",
-        "  <div class=\"jumbotron\" id=\"output\">",
-        "  </div>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
-    {
-      "id": "bad88fee1348bd9ae8c08626",
-      "title": "Wire AJAX Call into a jQuery Click Event",
-      "dashedName":  "waypoint-wire-ajax-call-into-a-jquery-click-event",
-      "description": [
-        "<img src=\"https://www.evernote.com/l/AjmAQ5BxGrFGRrWl_j2eSpGZMfrunfse89gB/image.png\">"
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "fccss",
-        "  var random = function() { return Math.floor(Math.random() * 3) }",
-        "  $(document).ready(function() {",
-        "",
-        "    $(\"#cat-button\").on(\"click\", function() {",
-        "      $.getJSON(\"/json/cats.json\", function( json ) {",
-        "        var kitten = json[random()];",
-        "      });",
-        "    });",
-        "",
-        "  });",
-        "fcces",
-        "<div class=\"container-fluid\">",
-        "  <button id=\"cat-button\" class=\"btn btn-primary btn-block btn-lg\">#cat-button</button>",
-        "  <div class=\"jumbotron\" id=\"output\">",
-        "  </div>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
-    {
-      "id": "bad88fee1348bd9ae8c08526",
-      "title": "Wire AJAX Call into a jQuery Click Event",
-      "dashedName":  "waypoint-wire-ajax-call-into-a-jquery-click-event",
-      "description": [
-        "<img src=\"https://www.evernote.com/l/AjmAQ5BxGrFGRrWl_j2eSpGZMfrunfse89gB/image.png\">"
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "fccss",
-        "  var random = function() { return Math.floor(Math.random() * 3) }",
-        "  $(document).ready(function() {",
-        "",
-        "    $(\"#cat-button\").on(\"click\", function() {",
-        "      $.getJSON(\"/json/cats.json\", function( json ) {",
-        "        var kitten = json[random()];",
-        "        $(\"<img src=\"\" + kitten.imageLink + \"\">\").appendTo(\"#output\");",
-        "      });",
-        "    });",
-        "",
-        "  });",
-        "<div class=\"container-fluid\">",
-        "  <button id=\"cat-button\" class=\"btn btn-primary btn-block btn-lg\">#cat-button</button>",
-        "  <div class=\"jumbotron\" id=\"output\">",
-        "  </div>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    },
-
-    {
-      "id": "bad88fee1348bd9ae8c08426",
-      "title": "Wire AJAX Call into a jQuery Click Event",
-      "dashedName":  "waypoint-wire-ajax-call-into-a-jquery-click-event",
-      "description": [
-        "<img src=\"https://www.evernote.com/l/AjmAQ5BxGrFGRrWl_j2eSpGZMfrunfse89gB/image.png\">"
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-        "fccss",
-        "  var random = function() { return Math.floor(Math.random() * 3) }",
-        "  $(document).ready(function() {",
-        "",
-        "    $(\"#cat-button\").on(\"click\", function() {",
-        "      $.getJSON(\"/json/cats.json\", function( json ) {",
-        "        var kitten = json[random()];",
-        "        $(\"<img src=\"\" + kitten.imageLink + \"\">\").appendTo(\"#output\");",
-        "        $(\"<h3>Code name: \" + kitten.codeNames[random()] + \"</h3>\").appendTo(\"#output\");",
-        "      });",
-        "    });",
-        "",
-        "  });",
-        "fcces",
-        "<div class=\"container-fluid\">",
-        "  <button id=\"cat-button\" class=\"btn btn-primary btn-block btn-lg\">#cat-button</button>",
-        "  <div class=\"jumbotron\" id=\"output\">",
-        "  </div>",
-        "</div>"
-      ],
-      "challengeType": 0,
-      "type": "waypoint"
-    }
-  ]
-}
diff --git a/server/README.md b/server/README.md
index 7b675cf5fe..9bb1e8b657 100644
--- a/server/README.md
+++ b/server/README.md
@@ -1,4 +1,4 @@
-Everything to due with the server
+Everything to do with the server.
 
 One file that is not tracked here is `rev-manifest.json`.
 It is generated at runtime and its contents changes as the contents
diff --git a/server/boot/a-extendUser.js b/server/boot/a-extendUser.js
index e93f741250..25cc14bf0a 100644
--- a/server/boot/a-extendUser.js
+++ b/server/boot/a-extendUser.js
@@ -72,9 +72,9 @@ module.exports = function(app) {
         'Feel free to email us at this address if you have ',
         'any questions about Free Code Camp.\n',
         'And if you have a moment, check out our blog: ',
-        'blog.freecodecamp.com.\n\n',
+        'medium.freecodecamp.com.\n\n',
         'Good luck with the challenges!\n\n',
-        '- the Free Code Camp Volunteer Team'
+        '- the Free Code Camp Team'
       ].join('')
     };
 
diff --git a/server/boot/nonprofits.js b/server/boot/nonprofits.js
index 37bb734755..f042f34354 100644
--- a/server/boot/nonprofits.js
+++ b/server/boot/nonprofits.js
@@ -64,23 +64,6 @@ module.exports = function(app) {
           return res.redirect('../nonprofit/' + dashedNameFull);
         }
 
-        //  We need to create logic that verifies completion.
-        //  Defaulting to false for now.
-        //  var buttonActive = false;
-        //  if (
-        //    req.user &&
-        //    req.user.completedCoursewares.length > 63
-        //  ) {
-        //    var hasShownInterest =
-        //      nonprofit.interestedCampers.filter(function(user) {
-        //        return user.username === req.user.username;
-        //      });
-        //
-        //    if (hasShownInterest.length === 0) {
-        //      buttonActive = true;
-        //    }
-        //  }
-
         res.render('nonprofits/show', {
           dashedName: dashedNameFull,
           title: nonprofit.name,
diff --git a/server/boot/redirects.js b/server/boot/redirects.js
index d0816d6a69..edd5d4b77c 100644
--- a/server/boot/redirects.js
+++ b/server/boot/redirects.js
@@ -12,6 +12,10 @@ module.exports = function(app) {
     res.redirect(301, '/pmi-acp-agile-project-managers');
   });
 
+  router.get('/wiki', function(req, res) {
+    res.redirect(301, '//github.com/freecodecamp/freecodecamp/wiki');
+  });
+
   router.get('/privacy', function(req, res) {
     res.redirect(
       301, "//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy"
diff --git a/server/boot/story.js b/server/boot/story.js
index d46b79f079..c1f188db81 100755
--- a/server/boot/story.js
+++ b/server/boot/story.js
@@ -12,13 +12,18 @@ var Rx = require('rx'),
     validator = require('validator'),
     secrets = require('../../config/secrets');
 
-var foundationDate = 1413298800000;
-var time48Hours = 172800000;
+import {
+  ifNoUser401,
+  ifNoUserRedirectTo
+} from '../utils/middleware';
 
-var unDasherize = utils.unDasherize;
-var dasherize = utils.dasherize;
-var getURLTitle = utils.getURLTitle;
-var ifNoUser401 = require('../utils/middleware').ifNoUser401;
+const foundationDate = 1413298800000;
+const time48Hours = 172800000;
+
+const unDasherize = utils.unDasherize;
+const dasherize = utils.dasherize;
+const getURLTitle = utils.getURLTitle;
+const sendNonUserToNews = ifNoUserRedirectTo('/news');
 
 function hotRank(timeValue, rank) {
   /*
@@ -62,8 +67,16 @@ module.exports = function(app) {
 
   router.get('/news/hot', hotJSON);
   router.get('/stories/hotStories', hotJSON);
-  router.get('/stories/submit', submitNew);
-  router.get('/stories/submit/new-story', preSubmit);
+  router.get(
+    '/stories/submit',
+    sendNonUserToNews,
+    submitNew
+  );
+  router.get(
+    '/stories/submit/new-story',
+    sendNonUserToNews,
+    preSubmit
+  );
   router.post('/stories/preliminary', ifNoUser401, newStory);
   router.post('/stories/', ifNoUser401, storySubmission);
   router.get('/news/', hot);
@@ -102,17 +115,25 @@ module.exports = function(app) {
   }
 
   function submitNew(req, res) {
+    if (!req.user.isGithubCool) {
+      req.flash('errors', {
+        msg: 'You must link GitHub with your account before you can post' +
+          ' on Camper News.'
+      });
+      return res.redirect('/news');
+    }
+
     return res.render('stories/index', {
       title: 'Submit a new story to Camper News',
       page: 'submit'
     });
   }
 
-  function preSubmit(req, res, next) {
+  function preSubmit(req, res) {
     var data = req.query;
     if (typeof data.url !== 'string') {
       req.flash('errors', { msg: 'No URL supplied with story' });
-      return next(new TypeError('No URL supplied with story'));
+      return res.redirect('/news');
     }
     var cleanedData = cleanData(data.url);
 
@@ -264,8 +285,11 @@ module.exports = function(app) {
   }
 
   function newStory(req, res, next) {
-    if (!req.user) {
-      return next(new Error('Must be logged in'));
+    if (!req.user.isGithubCool) {
+      req.flash('errors', {
+        msg: 'You must authenticate with Github to post to Camper News'
+      });
+      return res.redirect('/news');
     }
     var url = req.body.data.url;
 
diff --git a/server/middlewares/csp.js b/server/middlewares/csp.js
index 74914f56b2..24e1e848cf 100644
--- a/server/middlewares/csp.js
+++ b/server/middlewares/csp.js
@@ -55,6 +55,7 @@ export default function csp() {
   return helmet.csp({
     defaultSrc: trusted,
     scriptSrc: [
+      'https://*.gitter.im',
       '*.optimizely.com',
       '*.aspnetcdn.com',
       '*.d3js.org',
@@ -72,7 +73,8 @@ export default function csp() {
     imgSrc: [
       // allow all input since we have user submitted images for
       // public profile
-      '*'
+      '*',
+      'data:'
     ].concat(trusted),
     fontSrc: [
       '*.googleapis.com',
diff --git a/server/resources/labs.json b/server/resources/labs.json
index 5131432a29..0d025eeebc 100644
--- a/server/resources/labs.json
+++ b/server/resources/labs.json
@@ -6,13 +6,6 @@
     "description": "The elegant and lightweight boilerplate for full stack JavaScript.",
     "image": "http://i.imgur.com/ib1wOho.png"
   },
-  {
-    "camper": "akiralaine",
-    "name": "Camper News Bot",
-    "url": "https://twitter.com/campernewsbot",
-    "description": "This twitter bot tweets out Camper News stories once they hit 5 upvotes.",
-    "image": "https://pbs.twimg.com/media/CLXOFLPWIAEHYPJ.png"
-  },
   {
     "camper": "adventurebear",
     "name": "Coding Bootcamp Cost Calculator",
@@ -26,5 +19,19 @@
     "url": "https://github.com/open-source-society/computer-science",
     "description": "A path to a free education in Computer Science.",
     "image": "https://camo.githubusercontent.com/c42438055d3fee26b29e6d046fd8d06ebff3db20/687474703a2f2f692e696d6775722e636f6d2f6838786a72726a2e706e67"
+  },
+  {
+    "camper": "akiralaine",
+    "name": "Camper News Bot",
+    "url": "https://twitter.com/campernewsbot",
+    "description": "This twitter bot tweets out Camper News stories once they hit 5 upvotes.",
+    "image": "https://pbs.twimg.com/media/CLXOFLPWIAEHYPJ.png"
+  },
+  {
+    "camper": "roelver",
+    "name": "Free Code Camp Top 100 Campers",
+    "url": "http://fcctop100.herokuapp.com/",
+    "description": "This leaderboard tracks the campers who have been most active (completing challenges, helping other campers) in the past 30 days.",
+    "image": "http://i.imgur.com/4CrQfFi.png"
   }
 ]
diff --git a/server/utils/resources.json b/server/utils/resources.json
index a634575437..c80b9dafa7 100644
--- a/server/utils/resources.json
+++ b/server/utils/resources.json
@@ -70,7 +70,7 @@
     "Ride like the wind!",
     "Legen - wait for it - dary!",
     "Ludicrous Speed! Go!",
-    "Yes you can!",
+    "Yes we can!",
     "Most triumphant!",
     "One loop to rule them all!",
     "By the power of Grayskull!",
diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade
index 14243dee9b..c33348c259 100644
--- a/server/views/challengeMap/show.jade
+++ b/server/views/challengeMap/show.jade
@@ -20,14 +20,17 @@ block content
                 .spacer
                 if (user && user.progressTimestamps.length > 5)
                     #tshirt-notice.col-xs-12.col-md-8.col-md-offset-2.hidden
-                        h2.text-center Get our first-edition t-shirt
+                        h2.text-center Get our first-edition t-shirt.
+                            br
+                            span.text-success Only available until Oct 29!
                         img.thumbnail.img-center.img-responsive(src="http://i.imgur.com/o07uuOL.png")
                         p.text-justify Our community has voted. Get our winning design emblazoned on a durable, American-made American Apparel shirt (available in women's and men's sizes).&thinsp;
                             a(href="https://teespring.com/free-code-camp-shirt-eu" target="_blank") Also ships from Europe
                             | .
                         a.button.btn.btn-block.signup-btn(href="https://teespring.com/get-free-code-camp-t-shirt" target="_blank") Get yours
                         .button-spacer
-                        #hideTshirtNoticeButton.button.btn.btn-block.btn-info Hide this forever
+                        .text-center
+                            a#hideTshirtNoticeButton(href='#') Hide this forever
                         .spacer
                 .row
                     .col-xs-12.col-sm-8.col-sm-offset-2
@@ -87,7 +90,8 @@ block content
                     .row
                         .hidden-xs.col-sm-3.col-md-2
                             h3.text-primary.text-right.nowrap
-                                i.fa.fa-clock-o &thinsp;#{challengeBlock.time}
+                                i.fa.fa-clock-o
+                                = challengeBlock.time
                         .col-xs-12.col-sm-9.col-md-10
                             h3 #{challengeBlock.name} &thinsp;
 
@@ -121,7 +125,7 @@ block content
                                 .button-spacer
                                 .row
                                     .col-xs-12.col-sm-8.col-md-6.col-sm-offset-3.col-md-offset-2.hidden
-                                        a.btn.btn-lg.btn-block.signup-btn.map-challenge-block-share Section complete. Share your Portfolio with your friends.
+                                        a.btn.btn-lg.btn-block.signup-btn.map-challenge-block-share Section complete. Share your code portfolio with your friends.
                                             .hidden(id="#{challengeBlock.name}")
     script.
         var username = !{JSON.stringify(user && user.username || '')};
diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade
index 1768bd4274..92432a3bf4 100644
--- a/server/views/coursewares/showBonfire.jade
+++ b/server/views/coursewares/showBonfire.jade
@@ -1,12 +1,12 @@
 extends ../layout-wide
 block content
 
+    script(type='text/javascript', src='/bower_components/jshint/dist/jshint.js')
     script(type='text/javascript', src='/js/lib/codemirror/lib/codemirror.js')
     script(type='text/javascript', src='/js/lib/codemirror/addon/edit/closebrackets.js')
     script(type='text/javascript', src='/js/lib/codemirror/addon/edit/matchbrackets.js')
     script(type='text/javascript', src='/js/lib/codemirror/addon/lint/lint.js')
     script(type='text/javascript', src='/js/lib/codemirror/addon/lint/javascript-lint.js')
-    script(type='text/javascript', src='/bower_components/jshint/dist/jshint.js')
     script(type='text/javascript', src='/js/lib/chai/chai.js')
     link(rel='stylesheet', href='/js/lib/codemirror/lib/codemirror.css')
     link(rel='stylesheet', href='/js/lib/codemirror/addon/lint/lint.css')
@@ -52,7 +52,7 @@ block content
                     label.btn.btn-success#trigger-reset-modal
                         i.fa.fa-refresh
                             | &nbsp; Reset
-                    label.btn.btn-success#trigger-help-modal
+                    label.btn.btn-success#challenge-help-btn
                         i.fa.fa-medkit
                             | &nbsp; Help
                     label.btn.btn-success#trigger-issue-modal
@@ -88,8 +88,6 @@ block content
                         .form-group.codeMirrorView
                             textarea#codeEditor(autofocus=true, style='display: none;')
                     script(src=rev('/js', 'commonFramework.js'))
-                    script.
-                        editor.setOption("mode", "javascript");
 
     #complete-courseware-dialog.modal(tabindex='-1')
         .modal-dialog.animated.fadeIn.fast-animation
@@ -122,7 +120,14 @@ block content
                     a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel
     include ../partials/challenge-modals
     script.
-        var MDNlinks = !{JSON.stringify(MDNlinks)};
-        if (!MDNlinks.length) {
-            $('#MDN-links').addClass('collapse');
+
+      document.addEventListener('gitter-sidecar-ready', function(e) {
+        if (window.main) {
+          window.main.chat.createHelpChat('freecodecamp/helpbonfires', '#challenge-help-btn', 'Bonfires Help');
         }
+      });
+
+      var MDNlinks = !{JSON.stringify(MDNlinks)};
+      if (!MDNlinks.length) {
+          $('#MDN-links').addClass('collapse');
+      }
diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade
index f08d6997dc..ad2213e803 100644
--- a/server/views/coursewares/showHTML.jade
+++ b/server/views/coursewares/showHTML.jade
@@ -38,7 +38,11 @@ block content
                         label.btn.btn-success#trigger-reset-modal
                             i.fa.fa-refresh
                                 | &nbsp; Reset
-                        label.btn.btn-success#trigger-help-modal
+                        label.btn.btn-success.hidden-sm.hidden-md.hidden-lg
+                            a(href='//gitter.im/freecodecamp/help')
+                                i.fa.fa-medkit
+                                    | &nbsp; Help
+                        label.btn.btn-success.hidden-xs#challenge-help-btn
                             i.fa.fa-medkit
                                 | &nbsp; Help
                         label.btn.btn-success#trigger-issue-modal
@@ -72,6 +76,7 @@ block content
                                 textarea#codeEditor(autofocus=true, style='display: none;')
                                 script(src=rev('/js', 'commonFramework.js'))
                                 script.
+                                    editor.setOption('lint', false);
                                     editor.setOption("mode", "text/html");
         .col-md-4.col-lg-3
             .hidden-xs.hidden-sm
@@ -95,3 +100,9 @@ block content
                             else
                                 a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
     include ../partials/challenge-modals
+    script.
+      document.addEventListener('gitter-sidecar-ready', function(e) {
+        if (window.main) {
+          window.main.chat.createHelpChat('freecodecamp/help', '#challenge-help-btn');
+        }
+      });
diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade
index f4621b5b28..887e44c964 100644
--- a/server/views/coursewares/showJS.jade
+++ b/server/views/coursewares/showJS.jade
@@ -43,7 +43,7 @@ block content
                         label.btn.btn-success#trigger-reset-modal
                             i.fa.fa-refresh
                                 | &nbsp; Reset
-                        label.btn.btn-success#trigger-help-modal
+                        label.btn.btn-success#challenge-help-btn
                             i.fa.fa-medkit
                                 | &nbsp; Help
                         label.btn.btn-success#trigger-issue-modal
@@ -98,7 +98,12 @@ block content
                             a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge
     include ../partials/challenge-modals
     script.
-        var MDNlinks = !{JSON.stringify(MDNlinks)};
-        if (!MDNlinks.length) {
-            $('#MDN-links').addClass('collapse');
+      var MDNlinks = !{JSON.stringify(MDNlinks)};
+      if (!MDNlinks.length) {
+          $('#MDN-links').addClass('collapse');
+      }
+      document.addEventListener('gitter-sidecar-ready', function(e) {
+        if (window.main) {
+          window.main.chat.createHelpChat('freecodecamp/help', '#challenge-help-btn');
         }
+      });
diff --git a/server/views/coursewares/showStep.jade b/server/views/coursewares/showStep.jade
index 274b9e72b3..74bb6705f5 100644
--- a/server/views/coursewares/showStep.jade
+++ b/server/views/coursewares/showStep.jade
@@ -4,7 +4,8 @@ block content
         .col-md-8.col-md-offset-2
                 for step, index in description
                     .thumbnail.challenge-step(class=index !== 0 ? 'hidden': '')
-                        img.gif-block.img-center.img-responsive.thumbnail(src='#{step[0]}' alt='#{step[1]}')
+                        a(href=step[0] data-lightbox='img-enlarge')
+                            img.gif-block.img-center.img-responsive.thumbnail(src='#{step[0]}' alt='#{step[1]}')
                         .caption
                             p.large-p!= step[2]
                         if step[3]
diff --git a/server/views/coursewares/showVideo.jade b/server/views/coursewares/showVideo.jade
index bd7f42e5ed..90292e742d 100644
--- a/server/views/coursewares/showVideo.jade
+++ b/server/views/coursewares/showVideo.jade
@@ -24,7 +24,7 @@ block content
                     var userLoggedIn = true;
             .button-spacer
             .btn-group.input-group.btn-group-justified
-                .btn.btn-success.btn-big#trigger-help-modal
+                .btn.btn-success.btn-big#challenge-help-btn
                     i.fa.fa-medkit
                         | &nbsp; Get help
                 .btn.btn-success.btn-big#trigger-issue-modal
@@ -74,8 +74,14 @@ block content
         script.
             $('body').bind('keypress', controlEnterHandler);
     script.
-        var challenge_Id = !{JSON.stringify(challengeId)};
-        var challenge_Name = !{JSON.stringify(name)};
-        var challengeType = !{JSON.stringify(challengeType)};
-        var dashedName = !{JSON.stringify(dashedName)};
+      var challenge_Id = !{JSON.stringify(challengeId)};
+      var challenge_Name = !{JSON.stringify(name)};
+      var challengeType = !{JSON.stringify(challengeType)};
+      var dashedName = !{JSON.stringify(dashedName)};
+      document.addEventListener('gitter-sidecar-ready', function(e) {
+        if (window.main) {
+          window.main.chat.createHelpChat('freecodecamp/help', '#challenge-help-btn');
+        }
+      });
     include ../partials/challenge-modals
+
diff --git a/server/views/coursewares/showZiplineOrBasejump.jade b/server/views/coursewares/showZiplineOrBasejump.jade
index 174be42e3e..f5e4b666d2 100644
--- a/server/views/coursewares/showZiplineOrBasejump.jade
+++ b/server/views/coursewares/showZiplineOrBasejump.jade
@@ -24,7 +24,7 @@ block content
                 a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter)
             .button-spacer
             .btn-group.input-group.btn-group-justified
-                .btn.btn-success.btn-big#trigger-help-modal
+                .btn.btn-success.btn-big#challenge-help-btn
                     i.fa.fa-medkit
                         | &nbsp; Help
                 .btn.btn-success.btn-big#trigger-issue-modal
@@ -96,3 +96,23 @@ block content
         script.
             $('body').on('keypress', controlEnterHandler);
     include ../partials/challenge-modals
+    script.
+      document.addEventListener('gitter-sidecar-ready', function(e) {
+        var challengeType = !{JSON.stringify(challengeType)};
+        var room = 'freecodecamp/help';
+        var title;
+
+        if (challengeType === '4') {
+          room = 'freecodecamp/helpBasejumps';
+          title = 'Basejump Help';
+        }
+
+        if (challengeType === '3') {
+          room = 'freecodecamp/helpZiplines';
+          title = 'Zipline Help';
+        }
+
+        if (window.main) {
+          window.main.chat.createHelpChat(room, '#challenge-help-btn', title);
+        }
+      });
diff --git a/server/views/home.jade b/server/views/home.jade
index 404bb8b10f..9efdc7029d 100644
--- a/server/views/home.jade
+++ b/server/views/home.jade
@@ -24,7 +24,7 @@ block content
             .big-break
             .row
                 .col-xs-12.col-sm-8.col-sm-offset-2
-                    a.btn.btn-cta.signup-btn.btn-block(href="/login") Start learning to code (it's free)
+                    a.btn.btn-cta.signup-btn.btn-block(href="/signin") Start learning to code (it's free)
                     .button-spacer
                     a.btn.btn-cta.btn-success.btn-block(href="/nonprofits") My nonprofit needs coding help
             h2 As featured in:
@@ -91,6 +91,6 @@ block content
             .big-break
             .row
                 .col-xs-12.col-sm-8.col-sm-offset-2
-                    a.btn.btn-cta.signup-btn.btn-block(href="/login") Learn to code today (it's free)
+                    a.btn.btn-cta.signup-btn.btn-block(href="/signin") Learn to code today (it's free)
             script.
                 challengeName = 'Home'
diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade
index 46f6eae7ee..7510fbeef3 100644
--- a/server/views/partials/challenge-modals.jade
+++ b/server/views/partials/challenge-modals.jade
@@ -10,20 +10,6 @@
                 a.btn.btn-lg.btn-primary.btn-block#report-issue(name='_csrf', value=_csrf) Create my GitHub issue
                 a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel
 
-#help-modal.modal(tabindex='-1')
-    .modal-dialog.animated.fadeIn.fast-animation
-        .modal-content
-            .modal-header.challenge-list-header Need some help?
-                a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
-            .modal-body.text-center
-                h3 Remember to use &thinsp;
-                    a(href='//github.com/FreeCodeCamp/freecodecamp/wiki/How-to-get-help-when-you-get-stuck', target='_blank') Read-Search-Ask
-                    | .
-                h3 If you've already read the errors and searched Google, you should ask for help.
-                h3 This will take you to our help room.
-                a.btn.btn-lg.btn-primary.btn-block.close-modal(href='https://gitter.im/FreeCodeCamp/help', target='_blank') Take me to the help room
-                a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel
-
 #reset-modal.modal(tabindex='-1')
     .modal-dialog.animated.fadeInUp.fast-animation
         .modal-content
diff --git a/server/views/partials/footer.jade b/server/views/partials/footer.jade
index 8bdc9e80b7..6a84724a13 100644
--- a/server/views/partials/footer.jade
+++ b/server/views/partials/footer.jade
@@ -1,24 +1,27 @@
 .fcc-footer
     .col-xs-12.hidden-xs.hidden-sm
-        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="https://www.linkedin.com/edu/school?id=166029", target='_blank') &thinsp;LinkedIn&nbsp;
+        a.ion-speakerphone(href='//medium.freecodecamp.com', target='_blank') &nbsp;Blog&nbsp;&nbsp;
+        a.ion-social-github(href="//github.com/freecodecamp", target='_blank') &nbsp;GitHub&nbsp;&nbsp;
+        a.ion-social-linkedin(href="//www.linkedin.com/edu/school?id=166029", target='_blank') &thinsp;LinkedIn&nbsp;
+        a.ion-social-twitter(href="//twitter.com/freecodecamp", target='_blank') &nbsp;Twitter&nbsp;&nbsp;
         a.ion-social-facebook(href="//facebook.com/freecodecamp") &nbsp;Facebook&nbsp;&nbsp;
-        a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank') &nbsp;Twitter&nbsp;&nbsp;
+        a.ion-social-twitch-outline(href="//twitch.tv/freecodecamp", target='_blank') &thinsp;Twitch&nbsp;
         a.ion-locked(href="//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy") &nbsp;Privacy&nbsp;&nbsp;
     .col-xs-12.visible-xs.visible-sm
-        a.ion-speakerphone(href='http://blog.freecodecamp.com', target='_blank')
+        a.ion-speakerphone(href='//medium.freecodecamp.com', target='_blank')
             span.sr-only Free Code Camp's Blog
-        a.ion-social-github(href="http://github.com/freecodecamp", target='_blank')
+        a.ion-social-github(href="//github.com/freecodecamp", target='_blank')
             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="https://www.linkedin.com/edu/school?id=166029", target='_blank')
+        a.ion-social-linkedin(href="//www.linkedin.com/edu/school?id=166029", target='_blank')
             span.sr-only Free Code Camp LinkedIn Alumni Network
-        a.ion-social-facebook(href="//facebook.com/freecodecamp")
-            span.sr-only Free Code Camp local groups on Facebook
-        a.ion-social-twitter(href="http://twitter.com/freecodecamp", target='_blank')
+        a.ion-social-twitter(href="//twitter.com/freecodecamp", target='_blank')
             span.sr-only Free Code Camp on Twitter
+        a.ion-social-facebook(href="//facebook.com/freecodecamp", target='_blank')
+            span.sr-only Free Code Camp local groups on Facebook
+        a.ion-social-twitch-outline(href="/twitch", target='_blank')
+            span.sr-only Free Code Camp Live Pair Programming on Twitch.tv
         a.ion-locked(href="//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy")
             span.sr-only Free Code Camp's Privacy Policy
+
+// scripts should be moved here
+script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
diff --git a/server/views/partials/meta.jade b/server/views/partials/meta.jade
index c0074f4731..8ba19b0ca6 100644
--- a/server/views/partials/meta.jade
+++ b/server/views/partials/meta.jade
@@ -9,7 +9,7 @@ meta(http-equiv='X-UA-Compatible', content='IE=edge')
 meta(name='viewport', content='width=device-width, initial-scale=1.0')
 meta(name='csrf-token', content=_csrf)
 meta(name='keywords', content='learn to code, learn to program, learn programming, learn javascript, learn coding, code, coding, programming, software engineer, software developer, mean stack, web development, development, engineering, learn node.js, learn angular.js, learn express.js, learn mongoDB, coding bootcamp, javascript, open source')
-meta(property="og:title", content="Learn to code and build projects for nonprofits")
+meta(property="og:title", content="Learn to code and help nonprofits")
 meta(property="og:site_name", content="Free Code Camp")
 meta(name='twitter:widgets:csp', content='on')
 meta(name='p:domain_verify', content='d0bc047a482c03c24f1168004c2a216a')
@@ -27,7 +27,7 @@ meta(name="twitter:url", content="http://www.freecodecamp.com")
 meta(name="twitter:site", content="@freecodecamp")
 meta(name="twitter:card", content="summary_large_image")
 meta(name="twitter:image:src", content="https://s3.amazonaws.com/freecodecamp/curriculum-diagram-full.jpg")
-meta(name="twitter:title", content="Learn to code and build projects for nonprofits")
+meta(name="twitter:title", content="Learn to code and help nonprofits")
 meta(name="twitter:description", content="We're an open source community of busy people who learn to code and build projects for nonprofits. Build your full stack web development portfolio today.")
 meta(content="a40ee5d5dba3bb091ad783ebd2b1383f", name="p:domain_verify")
 meta(name="msapplication-TileColor", content="#FFFFFF")
diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
index 18f3320315..a53dd35892 100644
--- a/server/views/partials/navbar.jade
+++ b/server/views/partials/navbar.jade
@@ -11,8 +11,10 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
                 a.learn-btn(href='#') Learn
             li
                 a(href='/map') Map
-            li
-                a(href='//gitter.im/FreeCodeCamp/FreeCodeCamp', target='_blank') Chat
+            li.hidden-xs
+                a#nav-chat-btn(href='#' onclick="return false") Chat
+            li.visible-xs
+                a(href="//gitter.im/freecodecamp/freecodecamp" target="_blank") Chat
             li
                 a(href='/news', target='_blank') News
             li
diff --git a/server/views/stories/hot-stories.jade b/server/views/stories/hot-stories.jade
index 8cc7bb7659..9d512f8a8b 100644
--- a/server/views/stories/hot-stories.jade
+++ b/server/views/stories/hot-stories.jade
@@ -69,7 +69,7 @@
                                                 (typeof username !== 'undefined' ?
                                                   "<button id='" + data[i].id + "' class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost btn-upvote'>upvote</button>" :
                                                   "<a href='/signin' class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost'>upvote</a>") +
-                                                "<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost hidden' href='/news/" + linkedName + "'>more info</a> · " +
+                                                "<a class='btn btn-no-shadow btn-primary btn-xs btn-primary-ghost hidden' href='/news/" + linkedName + "'>more info</a> &nbsp; " +
                                                 rank + (rank > 1 ? " points" : " point") + " · posted " +
                                                 moment(data[i].timePosted).fromNow() +
                                                 " by <a href='/" + data[i].author.username + "'>@" + data[i].author.username + "</a> " +