diff --git a/app/views/components/certificates.hbs b/app/views/components/certificates.hbs
new file mode 100644
index 0000000..f59788e
--- /dev/null
+++ b/app/views/components/certificates.hbs
@@ -0,0 +1,21 @@
+{{#if resume.certificates.length}}
+<div class="container education-container">
+  {{> title value="Certificates"}} {{#each resume.certificates}}
+  <section class="item">
+    {{> section-header name=this.name }}
+    {{#if location}}
+      <h5 class="location">{{location}}</h5>
+    {{/if}}
+
+    <h4>{{#if issuer}}{{issuer}}{{/if}}</h4>
+        {{#if courses.length}}
+      <ul class="two-column">
+        {{#each courses}}
+        <li>{{.}}</li>
+        {{/each}}
+      </ul>
+    {{/if}}
+  </section>
+  {{/each}}
+</div>
+{{/if}}
diff --git a/app/views/partials/section-header.hbs b/app/views/partials/section-header.hbs
index c5dcab5..d90b735 100644
--- a/app/views/partials/section-header.hbs
+++ b/app/views/partials/section-header.hbs
@@ -18,6 +18,8 @@
     {{else}}
       <span class="endDate"> - Present</span>
     {{/if}}
+    {{else if date}}
+      {{ date }}
     {{else if releaseDate}}
       {{formatDate releaseDate}}
     {{/if}}
diff --git a/app/views/resume.hbs b/app/views/resume.hbs
index 28757ba..057e421 100755
--- a/app/views/resume.hbs
+++ b/app/views/resume.hbs
@@ -26,6 +26,7 @@
         {{> work }}
         {{> volunteer }}
         {{> education }}
+        {{> certificates }}
         {{> awards }}
         {{> publications }}
         {{> references }}