diff --git a/client/less/wiki.less b/client/less/wiki.less
index 43faafc0fd..8b41835b5e 100644
--- a/client/less/wiki.less
+++ b/client/less/wiki.less
@@ -2,6 +2,16 @@
  * based off of https://github.com/gitterHQ/sidecar
  * license: MIT
  */
+ 
+#wikiFrame {
+    width: 100%;
+    height: 100%;
+    top: 0;
+    bottom: 0;
+    position: absolute;
+    overflow: hidden;
+}
+
 .wiki-aside {
     width:500px;
 
@@ -49,6 +59,18 @@
     }
 }
 
+.wiki-aside .wiki-header {
+  display: none;
+}
+
+.wiki-aside .wiki-container {
+  padding-top: 10px;
+}
+
+.wiki-aside .wikiSelector {
+  top: 50px;
+}
+
 .wiki-aside-action-bar {
     position: absolute;
     top: 0;
@@ -107,7 +129,7 @@
     border-color: darkgreen;
 }
 
-
+wiki
 
 .wiki-aside-action-item {
     display: flex;
diff --git a/client/main.js b/client/main.js
index b40144a741..d557ac9a49 100644
--- a/client/main.js
+++ b/client/main.js
@@ -383,7 +383,7 @@ $(document).ready(function() {
   function showWiki() {
     if (!main.isWikiAsideLoad) {
       var wikiAside = $('<iframe>');
-      wikiAside.attr('src', 'http://beta.freecodecamp.com/wiki');
+      wikiAside.attr('src', 'http://freecodecamp.github.io/wiki'); /*  <-----------------------------------------  here */
       $('.wiki-aside').append(wikiAside);
       main.isWikiAsideLoad = true;
     }
diff --git a/server/boot/redirects.js b/server/boot/redirects.js
index 5703897e7f..a02196f0aa 100644
--- a/server/boot/redirects.js
+++ b/server/boot/redirects.js
@@ -13,10 +13,6 @@ 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,
@@ -30,7 +26,7 @@ module.exports = function(app) {
   });
 
   router.get('/field-guide/*', function(req, res) {
-    res.redirect(302, '//github.com/freecodecamp/freecodecamp/wiki');
+    res.redirect(302, '/wiki');
   });
 
   router.get('/about', function(req, res) {
diff --git a/server/boot/t-wiki.js b/server/boot/t-wiki.js
new file mode 100644
index 0000000000..a4036ef975
--- /dev/null
+++ b/server/boot/t-wiki.js
@@ -0,0 +1,10 @@
+module.exports = function(app) {
+  var router = app.loopback.Router();
+  router.get('/wiki', showWiki);
+
+  app.use(router);
+
+  function showWiki(req, res) {
+    res.render('wiki/show', { title: 'Wiki | Free Code Camp' });
+  }
+};
diff --git a/server/middlewares/csp.js b/server/middlewares/csp.js
index 2a85ff6fa1..e5ee754684 100644
--- a/server/middlewares/csp.js
+++ b/server/middlewares/csp.js
@@ -65,7 +65,9 @@ export default function csp() {
         '*.vimeo.com',
         '*.twitter.com',
         '*.ghbtns.com',
-        '*.freecatphotoapp.com'
+        '*.freecatphotoapp.com',
+        'freecodecamp.github.io',
+        'localhost:8000'        
       ].concat(trusted)
     },
     // set to true if you only want to report errors
diff --git a/server/views/wiki/show.jade b/server/views/wiki/show.jade
new file mode 100644
index 0000000000..c81fdc36a6
--- /dev/null
+++ b/server/views/wiki/show.jade
@@ -0,0 +1,3 @@
+extends ../layout-wide
+block content
+            iframe#wikiFrame(frameborder='no', src='http://freecodecamp.github.io/wiki')
\ No newline at end of file