diff --git a/.gitignore b/.gitignore
index 52453958f..874dec434 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 .bundle
 .jekyll-metadata
+_data/api/*
+_data/nav_api.yml
 _site
 _config-prod.yml
 _config-local.yml
-docs
+api/*
 vendor
diff --git a/_data/api/.gitkeep b/_data/api/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/_includes/namespace.html b/_includes/namespace.html
new file mode 100644
index 000000000..986c1a905
--- /dev/null
+++ b/_includes/namespace.html
@@ -0,0 +1,47 @@
+{% if include.data.borrows.size %}
+## Extends
+{% for item in include.data.borrows %}
+[{{ item }}]({{ site.baseurl }}/api/class/{{ item | api_url }})
+{% endfor %}
+{% endif %}
+
+{% if include.data.properties.size > 0 %}
+## Properties
+link | summary
+--- | ---
+{% for item in include.data.properties %}[{{ item.name }}]({{ site.baseurl }}/api/{{ item.dataTypes[0] | api_url }}) | {{ item.summary | no_nl }}
+{% endfor %}
+{% endif %}
+
+{% if include.data.methods.size > 0 %}
+## Methods
+{% for item in include.data.methods %}
+
+### {{ item.name }}
+{{ item.summary | no_nl }}
+
+#### Signature
+`{{ item.signature }}`
+
+{% if item.params.size > 0 %}
+#### Parameters
+
+Name | Type | Description
+--- | --- | ---
+{% for param in item.params %}{{ param.name }} | {{ param.types }} | {{ param.desc | no_nl }}
+{% endfor %}
+{% endif %}
+
+#### Return type
+{% for type in item.return.types %}[{{ type }}]({{ site.baseurl}}/api/class/{{ type | api_url }}), {% endfor %}: {{ item.return.desc }}
+
+{% endfor %}
+{% endif %}
+
+{% if include.data.events.size > 0 %}
+## Events
+link | summary
+--- | ---
+{% for item in include.data.events %}[{{ item.name }}]({{ site.baseurl }}/api/{{ item.dataTypes[0] | api_url }}) | {{ item.summary | no_nl }}
+{% endfor %}
+{% endif %}
diff --git a/_includes/nav.html b/_includes/nav.html
index 5e7cf78f3..cfcdd6461 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,6 +1,7 @@
 <ul>
 {% for link in include.links %}
-  {% if page.url contains link.url %}
+  {% capture slash_url_slash %}/{{ link.url }}/{% endcapture %}
+  {% if page.url contains slash_url_slash %}
   	<li class="active">
   {% else %}
   	<li>
diff --git a/_layouts/default.html b/_layouts/default.html
index a89db2a60..1eb1db5ce 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -37,7 +37,8 @@
 
   <div class="main {{ page.type }}">
     <aside class="side-nav">
-      {% include nav.html links=site.data.nav preceding_address="/" %}
+      {% assign nav = site.data.nav | array_concat:site.data.nav_api %}
+      {% include nav.html links=nav preceding_address="/" %}
     </aside>
 
     <div class="heading">
diff --git a/_plugins/api_url.rb b/_plugins/api_url.rb
new file mode 100644
index 000000000..421adf069
--- /dev/null
+++ b/_plugins/api_url.rb
@@ -0,0 +1,9 @@
+module Jekyll
+  module APIURLFilter
+    def api_url(input)
+      input.gsub(/\./, "/").downcase if !input.nil?
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::APIURLFilter)
diff --git a/_plugins/array_concat.rb b/_plugins/array_concat.rb
new file mode 100644
index 000000000..40e8bb175
--- /dev/null
+++ b/_plugins/array_concat.rb
@@ -0,0 +1,12 @@
+module Jekyll
+  module ArrayConcatFilter
+    def array_concat(arr1, arr2)
+      result = []
+      result.concat(arr1)
+      result.concat(arr2)
+      arr1 = result
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::ArrayConcatFilter)
diff --git a/_plugins/no_nl.rb b/_plugins/no_nl.rb
new file mode 100644
index 000000000..c0348d631
--- /dev/null
+++ b/_plugins/no_nl.rb
@@ -0,0 +1,9 @@
+module Jekyll
+  module NoNLFilter
+    def no_nl(input)
+      input.gsub(/\n/, " ")if !input.nil?
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::NoNLFilter)
diff --git a/api/class/index.md b/api/class/index.md
new file mode 100644
index 000000000..465ac78d1
--- /dev/null
+++ b/api/class/index.md
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Classes
+description: Lorem ipsum dolor sit amet, consectetur adipisicing elit laborum.
+type: folder
+---
diff --git a/api/index.md b/api/index.md
new file mode 100644
index 000000000..245c17614
--- /dev/null
+++ b/api/index.md
@@ -0,0 +1,6 @@
+---
+layout: default
+title: API Reference
+description: Lorem ipsum dolor sit amet, consectetur adipisicing elit laborum.
+type: folder
+---
diff --git a/api/mixin/index.md b/api/mixin/index.md
new file mode 100644
index 000000000..bc0fb1b90
--- /dev/null
+++ b/api/mixin/index.md
@@ -0,0 +1,9 @@
+---
+layout: default
+title: Mixins
+description: Lorem ipsum dolor sit amet, consectetur adipisicing elit laborum.
+type: folder
+---
+
+{% assign links = site.data.nav_api[1].pages %}
+{% include index.html links=links %}