diff --git a/challenges/05-full-stack-development-certification/nonprofit-projects.json b/challenges/05-full-stack-development-certification/nonprofit-projects.json
new file mode 100644
index 0000000000..cada08daad
--- /dev/null
+++ b/challenges/05-full-stack-development-certification/nonprofit-projects.json
@@ -0,0 +1,28 @@
+{
+  "name": "Nonprofit Projects",
+  "order": 22,
+  "time": "800 Hours",
+  "isLocked": true,
+  "message": "To qualify for these nonprofit projects, you must first earn all three foundational certifications: Front End, Data Visualization, and Back End",
+  "challenges": [
+    {
+      "title": "Greenfield Nonprofit Project #1",
+      "isRequired": true
+    },
+    {
+      "title": "Greenfield Nonprofit Project #2",
+      "isRequired": true
+    },
+    {
+      "title": "Legacy Code Nonprofit Project #1",
+      "isRequired": true
+    },
+    {
+      "title": "Legacy Code Nonprofit Project #2",
+      "isRequired": true
+    },
+    {
+      "title": "Claim your Full Stack Development Certification"
+    }
+  ]
+}
diff --git a/challenges/06-coding-interview-preperation/coding-interview-training.json b/challenges/06-coding-interview-preperation/coding-interview-training.json
new file mode 100644
index 0000000000..c38eb790e2
--- /dev/null
+++ b/challenges/06-coding-interview-preperation/coding-interview-training.json
@@ -0,0 +1,18 @@
+{
+  "name": "Coding Interview Training",
+  "order": 23,
+  "time": "70 Hours",
+  "isLocked": true,
+  "message": "To qualify for these nonprofit projects, you must first earn all three foundational certifications: Front End, Data Visualization, and Back End",
+  "challenges": [
+    {
+      "title": "Soft Skill Training"
+    },
+    {
+      "title": "Critical Thinking Training"
+    },
+    {
+      "title": "Whiteboard Coding Training"
+    }
+  ]
+}
diff --git a/challenges/06-coding-interview-preperation/mock-interview-training.json b/challenges/06-coding-interview-preperation/mock-interview-training.json
new file mode 100644
index 0000000000..4e9d94d969
--- /dev/null
+++ b/challenges/06-coding-interview-preperation/mock-interview-training.json
@@ -0,0 +1,18 @@
+{
+  "name": "Mock Interviews",
+  "order": 24,
+  "time": "10 Hours",
+  "isLocked": true,
+  "message": "To qualify for these nonprofit projects, you must first earn all three foundational certifications: Front End, Data Visualization, and Back End",
+  "challenges": [
+    {
+      "title": "Mock Interview #1"
+    },
+    {
+      "title": "Mock Interview #2"
+    },
+    {
+      "title": "Mock Interview #3"
+    }
+  ]
+}
diff --git a/index.js b/index.js
index bb141de18b..4f91843e89 100644
--- a/index.js
+++ b/index.js
@@ -40,6 +40,8 @@ Observable.combineLatest(
     var fileName = challengeSpec.fileName;
     var helpRoom = challengeSpec.helpRoom || 'Help';
     var time = challengeSpec.time || 'N/A';
+    var isLocked = !!challengeSpec.isLocked;
+    var message = challengeSpec.message;
 
     console.log('parsed %s successfully', blockName);
 
@@ -54,8 +56,10 @@ Observable.combineLatest(
       dashedName: dasherize(blockName),
       superOrder: superOrder,
       superBlock: superBlock,
+      superBlockMessage: message,
       order: order,
-      time: time
+      time: time,
+      isLocked: isLocked
     };
 
     return createBlocks(block)
@@ -85,6 +89,7 @@ Observable.combineLatest(
             challenge.blockId = block.id;
             challenge.isBeta = challenge.isBeta || isBeta;
             challenge.isComingSoon = challenge.isComingSoon || isComingSoon;
+            challenge.isLocked = challenge.isLocked || isLocked;
             challenge.time = challengeSpec.time;
             challenge.superOrder = superOrder;
             challenge.superBlock = superBlock