diff --git a/challenges/basic-bonfires.json b/challenges/basic-bonfires.json
index a6cf5aebf4..df4b6bc16c 100644
--- a/challenges/basic-bonfires.json
+++ b/challenges/basic-bonfires.json
@@ -46,9 +46,8 @@
       "dashedName": "bonfire-meet-bonfire",
       "difficulty": "0",
       "description": [
-        "Click the button below for further instructions.",
         "Your goal is to fix the failing test.",
-        "First, run all the tests by clicking \"Run code\" or by pressing Control + Enter",
+        "First, run all the tests by clicking \"Run code\" or by pressing Control + Enter.",
         "The failing test is in red. Fix the code so that all tests pass. Then you can move on to the next Bonfire.",
         "Make this function return true no matter what."
       ],
diff --git a/future-jquery-ajax-json.json b/future-jquery-ajax-json.json
index 97d0504f04..2a3a5d9cd7 100644
--- a/future-jquery-ajax-json.json
+++ b/future-jquery-ajax-json.json
@@ -1,73 +1,231 @@
 {
   "name": "jQuery, Ajax and JSON",
-  "order" : 0.004,
-  "challenges": [
-    {
+  "order": 0.004,
+  "challenges": [{
       "id": "bad87fee1348bd9acdd08826",
       "name": "Waypoint: Learn how Script Tags and Document Ready Work",
       "difficulty": 0.072,
       "description": [
-        "Test"
+        "We've simplified our Cat Photo App and removed our <code>style</code> element. Add a <code>script</code> element to your page and create a <code>$(document).ready</code> function within it.",
+        "Add <code>$(document).ready(function() {</code> to your <code>script</code> element, and then close it on the following line with <code>});</code>."
       ],
       "tests": [
-        "assert(typeof $('#target').attr('disabled') === 'undefined', 'Change the disabled attribute of the \"target\" button to false');",
-        "expect($('#target')).to.exist()"
+        "assert(editor.match(/<script>/g), 'Create a <code>script</code> element.')",
+        "assert(editor.match(/<\\/script>/g) && editor.match(/<script/g) && editor.match(/<\\/script>/g).length === editor.match(/<script/g).length, 'Make sure your <code>script</code> element has a closing tag.')",
+        "assert(editor.match(/\\$\\(document\\)\\.ready\\(function\\(\\)\\s?\\{/g), 'Add <code>$(document).ready(function() {</code> to the beginning of your <code>script</code> element.')",
+        "assert(editor.match(/\\n\\s+?\\}\\);/g), 'Close your <code>$(document).ready(function() {</code> function with <code>\\}\\);</code>.')"
+      ],
+      "challengeSeed": [
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
+      ],
+      "challengeType": 0
+    },
+
+    {
+      "id": "bad87fee1348bd9bedc08826",
+      "name": "Waypoint: Target Elements by Selectors Using jQuery",
+      "difficulty": 0.073,
+      "description": [
+        "Make all <code>img</code> elements bounce $('img').addClass('animated bounce')"
+      ],
+      "tests": [
+        "assert($('img').hasClass('animated') && $('img').hasClass('bounce'), 'Use the jQuery <code>addClass()</code> function to give the classes \"animated\" and \"bounce\" to your <code>img</code> element.')",
+        "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [
         "fccss",
         "  $(document).ready(function() {",
-        "    $('#target').attr('disabled', true)",
+        "",
         "  });",
         "fcces",
-        "<button id='target' class='btn btn-primary btn-block'>Enable this button with jQuery</button>"
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
 
     {
       "id": "bad87fee1348bd9aedc08826",
-      "name": "Waypoint: Target Elements by Selectors Using jQuery",
-      "difficulty": 0.073,
-      "description": [
-
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-
-      ],
-      "challengeType": 0
-    },
-
-    {
-      "id": "bad87fee1348bd9aedb08826",
       "name": "Waypoint: Target Elements by Class Using jQuery",
       "difficulty": 0.074,
       "description": [
 
       ],
       "tests": [
-
+        "assert($('.btn').hasClass('animated') && $('.btn').hasClass('shake'), 'Use the jQuery <code>addClass()</code> function to give the classes \"animated\" and \"shake\" to all your elements with the class \"btn\".')",
+        "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('img').addClass('animated bounce');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
+      ],
+      "challengeType": 0
+    },
 
+    {
+      "id": "bad87fee1348bd9aedb08826",
+      "name": "Waypoint: Add an ID to an Element",
+      "difficulty": 0.075,
+      "description": [
+
+      ],
+      "tests": [
+        "assert($('form').attr('id') === 'cat-photo-form', 'Add the ID of \"cat-photo-form\" to your <code>form</code> element.')"
+      ],
+      "challengeSeed": [
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('img').addClass('animated bounce');",
+        "    $('.btn').addClass('animated shake');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
 
     {
       "id": "bad87fee1348bd9aeda08826",
-      "name": "Waypoint: Target an element by ID Using jQuery",
+      "name": "Waypoint: Target Elements by ID Using jQuery",
       "difficulty": 0.075,
       "description": [
 
       ],
       "tests": [
-
+        "assert($('#cat-photo-form') && $('#cat-photo-form').hasClass('animated') && $('#cat-photo-form').hasClass('pulse'), 'Select the element with the <code>id</code> of \"cat-photo-form\" and use the jQuery <code>addClass()</code> function to give it the classes of \"animated\" and \"pulse\".')",
+        "assert(!editor.match(/class.*animated/g), 'Only use jQuery to add these classes to the element.')"
       ],
       "challengeSeed": [
-
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('img').addClass('animated bounce');",
+        "    $('.btn').addClass('animated shake');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo' id='cat-photo-form'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
@@ -80,10 +238,42 @@
 
       ],
       "tests": [
-
+        "assert(!editor.match(/nce\\'\\)\\;/g) && !editor.match(/ke\\'\\)\\;/g), 'Delete your <code>img</code> element selector statement and your \".btn\" selector statement.')",
+        "assert(editor.match(/css.*,.*background-color.*gray.\\);/g), 'Select the element with the <code>id</code> of \"cat-photo-form\" give it the background color of gray.')"
       ],
       "challengeSeed": [
-
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('img').addClass('animated bounce');",
+        "    $('.btn').addClass('animated shake');",
+        "    $('#cat-photo-form').addClass('animated pulse');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo' id='cat-photo-form'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
@@ -96,10 +286,40 @@
 
       ],
       "tests": [
-
+        "assert($('form button').attr('id') === 'submit-button', 'Add the ID of \"submit-button\" to your the <code>button</code> on your <code>form</code> element.')",
+        "assert($('#submit-button') && $('#submit-button').prop('disabled'), 'Disable your element with the id of \"submit-button\".')"
       ],
       "challengeSeed": [
-
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('#cat-photo-form').css('background-color', 'gray');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo' id='cat-photo-form'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
@@ -112,10 +332,41 @@
 
       ],
       "tests": [
-
+        "assert($('img').length === 0, 'Use jQuery to remove your <code>img</code> element from your page.')",
+        "assert(editor.match(/<img/g), 'You should still have an <code>img</code> element in your HTML but jQuery should remove it.')"
       ],
       "challengeSeed": [
-
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('#cat-photo-form').css('background-color', 'gray');",
+        "    $('#submit-button').prop('disabled', 'true');",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo' id='cat-photo-form'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' id='submit-button' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "challengeType": 0
     },
@@ -125,7 +376,38 @@
       "name": "Waypoint: Move an Element Using jQuery",
       "difficulty": 0.079,
       "description": [
-
+        "fccss",
+        "  $(document).ready(function() {",
+        "    $('#cat-photo-form').css('background-color', 'gray');",
+        "    $('#submit-button').prop('disabled', 'true');",
+        "    $('img').remove();",
+        "  });",
+        "fcces",
+        "<br>",
+        "<img src='http://bit.ly/fcc-kittens2' class='img-responsive'>",
+        "<br>",
+        "<div class='row'>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-primary'><i class='fa fa-thumbs-up'></i> Like</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-info'><i class='fa fa-info-circle'></i> Info</button>",
+        "  </div>",
+        "  <div class='col-xs-4'>",
+        "    <button class='btn btn-block btn-danger'><i class='fa fa-trash'></i> Delete</button>",
+        "  </div>",
+        "</div>",
+        "<br>",
+        "<form action='submit-cat-photo' id='cat-photo-form'>",
+        "  <div class='row'>",
+        "    <div class='col-xs-7'>",
+        "      <input type='text' class='form-control' placeholder='cat photo URL' required>",
+        "    </div>",
+        "    <div class='col-xs-5'>",
+        "      <button type='submit' id='submit-button' class='btn btn-primary'><i class='fa fa-paper-plane'></i> Submit</button>",
+        "    </div>",
+        "  </div>",
+        "</form>"
       ],
       "tests": [
 
@@ -152,22 +434,6 @@
       "challengeType": 0
     },
 
-    {
-      "id": "bad87fee1348bd9aed408826",
-      "name": "Waypoint: Animate an Element Using jQuery",
-      "difficulty": 0.081,
-      "description": [
-
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-
-      ],
-      "challengeType": 0
-    },
-
     {
       "id": "bad87fee1348bd9aed308826",
       "name": "Waypoint: Target the Parent of an Element Using jQuery",
@@ -295,8 +561,7 @@
 
       ],
       "challengeType": 0
-    },
-    {
+    }, {
       "id": "bad87fee1348bd9aede08826",
       "name": "Waypoint: Use Hex Codes for Precise Colors",
       "difficulty": 0.071,
@@ -310,8 +575,7 @@
 
       ],
       "challengeType": 0
-    },
-    {
+    }, {
       "id": "bad87fee1348bd9aedd08826",
       "name": "Waypoint: Use Shortened Hex Codes for Colors",
       "difficulty": 0.071,