diff --git a/app.js b/app.js
index 5ab914d0fd..ae1c3301e5 100644
--- a/app.js
+++ b/app.js
@@ -28,6 +28,7 @@ var connectAssets = require('connect-assets');
 var homeController = require('./controllers/home');
 var curriculumController = require('./controllers/curriculum');
 var courseController = require('./controllers/course')
+var challengeController = require('./controllers/challenge')
 var userController = require('./controllers/user');
 var apiController = require('./controllers/api');
 var contactController = require('./controllers/contact');
@@ -123,6 +124,12 @@ app.get('/', homeController.index);
 app.get('/curriculum', curriculumController.index);
 app.get('/courses/:id', courseController.view);
 app.get('/courses', courseController.index);
+app.get('/challenges/:id', challengeController.view);
+app.get('/challenges', challengeController.index);
+app.get('/challenges/first_website', challengeController.firstWebsite)
+app.get('/challenges/first_pair_programming_session', challengeController.firstPairProgrammingSession)
+app.get('/challenges/first_dynamic_website', challengeController.firstDynamicWebsite)
+app.get('/challenges/first_codepen', challengeController.firstCodePen)
 app.get('/login', userController.getLogin);
 app.post('/login', userController.postLogin);
 app.get('/logout', userController.logout);
diff --git a/models/User.js b/models/User.js
index 157dc66021..0eb9c5d163 100644
--- a/models/User.js
+++ b/models/User.js
@@ -13,6 +13,7 @@ var userSchema = new mongoose.Schema({
   google: String,
   instagram: String,
   tokens: Array,
+  challenges_completed: Array,
 
   profile: {
     name: { type: String, default: '' },
diff --git a/views/challenge/index.jade b/views/challenge/index.jade
new file mode 100644
index 0000000000..03a48f5b4c
--- /dev/null
+++ b/views/challenge/index.jade
@@ -0,0 +1,5 @@
+extends ../layout
+block content
+    each challenge in challenges
+        li
+            a(href="/challenges/#{challenge._id}") #{challenge.name}
\ No newline at end of file
diff --git a/views/challenge/view.jade b/views/challenge/view.jade
new file mode 100644
index 0000000000..e69de29bb2