diff --git a/404.md b/404.md
index e3329eb792..eda26d64ea 100644
--- a/404.md
+++ b/404.md
@@ -12,6 +12,15 @@ function doFwd() {
   var gonnaFwd = false;
   var newURL = "";
   console.log(forwardingURL);
+  {% for item in site.data.redirects %}
+  var redirectVal = {{ item | jsonify }};
+  if (forwardingURL.indexOf(redirectVal.source) > -1)
+  {
+    console.log("Found via CSV @ ", redirectVal.source, redirectVal.destination);
+    gonnaFwd = true;
+    newURL = forwardingURL.replace(redirectVal.source,redirectVal.destination);
+  }
+  {% endfor %}
   {% for page in site.pages %}{% if page.aliases %}
   var aliases = {{ page.aliases | jsonify }};
   if( Object.prototype.toString.call( aliases ) === '[object Array]' ) {
@@ -20,7 +29,7 @@ function doFwd() {
     {
       if (forwardingURL.indexOf(aliases[i]) > -1)
       {
-        console.log("Found! ", forwardingURL.indexOf(aliases[i]), aliases[i])
+        console.log("Found via Page Aliases on a multi-alias page @", "{{ page.url }}", aliases[i])
         gonnaFwd = true;
         newURL = "{{ page.url }}";
       }
@@ -29,7 +38,7 @@ function doFwd() {
     // only one alias for this page.
     if (forwardingURL.indexOf(aliases) > -1)
     {
-      console.log("Found! ", forwardingURL.indexOf(aliases[i]), aliases[i])
+      console.log("Found via Page Aliases on a single-alias page @", forwardingURL.indexOf(aliases[i]), aliases[i])
       gonnaFwd = true;
       newURL = "{{ page.url }}";
     }
@@ -38,6 +47,7 @@ function doFwd() {
   {% for item in site.data.docsarchive.docker-compose %}
   if (forwardingURL.indexOf("/{{ item[0] }}") > -1)
   {
+    console.log("Found via Docker Compose file for Acrhive")
     gonnaFwd = true;
     if(portNumber.length > 0) {
       // there is a port number in the location; make sure to replace it
@@ -50,9 +60,11 @@ function doFwd() {
   }{% endfor %}
   if (gonnaFwd) {
     console.log("Forwarding to: " + newURL);
-    window.location.replace(newURL);
+    //window.location.replace(newURL);
+    //document.write('<meta http-equiv="refresh" content="0; url=' + newURL + '">')
   } else {
-    window.location.replace("/sorry/#" + forwardingURL);
+    //window.location.replace("/sorry/#" + forwardingURL);
+    //document.write('<meta http-equiv="refresh" content="0; url=/sorry/#' + forwardingURL + '">')
   }
 }
 window.onload = doFwd;
diff --git a/_data/empty.yaml b/_data/empty.yaml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/_data/redirects.csv b/_data/redirects.csv
new file mode 100644
index 0000000000..fcb44b0b90
--- /dev/null
+++ b/_data/redirects.csv
@@ -0,0 +1,50 @@
+source,destination
+engine/quickstart/,engine/getstarted/
+engine/containers/,engine/tutorials/
+win/,docker-for-windows/
+mac/,docker-for-mac/
+linux/,engine/
+article-img/,engine/article-img/
+articles/,engine/articles/
+examples/,engine/examples/
+extend/,engine/extend/
+installation/,engine/installation/
+introduction/,engine/introduction/
+misc/,engine/misc/
+project/,opensource/project/
+reference/,engine/reference/
+security/,engine/security/
+static_files/,engine/static_files/
+userguide/,engine/userguide/
+en/latest/installation/,engine/installation/
+docker-hub-enterprise/install/,docker-trusted-registry/install/
+docker-io/builds/,docker-hub/builds/
+docker-trusted-registry/license/install-csengine.md,docker-trusted-registry/install/install-csengine/
+engine/articles/basics/,engine/userguide/basics/
+engine/project/set-up-git/,opensource/project/set-up-git/
+engine/reference/articles/basics.md,engine/userguide/basics/
+engine/userguide/dockerlinks/,engine/userguide/networking/default_network/dockerlinks/
+installation/,engine/installation/
+networking/,engine/userguide/networking/
+opensource/project/advanced-contributing/,opensource/workflow/advanced-contributing/
+opensource/project/create-pr/,opensource/workflow/create-pr/
+opensource/project/find-an-issue/,opensource/workflow/find-an-issue/
+opensource/project/get-help/,opensource/get-help/
+opensource/project/make-a-contribution/,opensource/workflow/make-a-contribution/
+opensource/project/review-pr/,opensource/workflow/review-pr/
+opensource/project/work-issue/,opensource/workflow/work-issue/
+opensource/workflow/doc-style/,opensource/doc-style/
+opensource/workflow/get-help/,opensource/get-help/
+opensource/workflow/set-up-dev-env/,opensource/project/set-up-dev-env/
+opensource/workflow/set-up-git/,opensource/project/set-up-git/
+opensource/workflow/test-and-docs/,opensource/project/test-and-docs/
+userguide/,engine/userguide/
+docker-trusted-registry/adminguide/upgrade.md,docker-trusted-registry/install/upgrade/
+docker-trusted-registry/quick-start/install.md,docker-trusted-registry/install/
+docker-trusted-registry/adminguide/docker-trusted-registry/install.md,docker-trusted-registry/install/
+v1.6/docker-hub/,docker-hub/
+v1.7/docker-hub/,docker-hub/
+v1.8/docker-hub/,docker-hub/
+v1.9/docker-hub/,docker-hub/
+v1.10/docker-hub/,docker-hub/
+v1.11/docker-hub/,docker-hub/