diff --git a/content/resume.md b/content/resume.md
index e58b342..b542cf4 100644
--- a/content/resume.md
+++ b/content/resume.md
@@ -57,6 +57,8 @@ type: resume
 
 ## Education
 
-Oberlin College, BA in Computer Science with Honors, 2010
+{{< resume_flex 2010 >}}
+Oberlin College, BA in Computer Science with Honors
+{{< /resume_flex >}}
 
 [wwdc21-totp-video]: https://developer.apple.com/videos/play/wwdc2021/10105/
\ No newline at end of file
diff --git a/layouts/shortcodes/resume_flex.html b/layouts/shortcodes/resume_flex.html
new file mode 100644
index 0000000..7500a31
--- /dev/null
+++ b/layouts/shortcodes/resume_flex.html
@@ -0,0 +1,18 @@
+<header class="flex-date">
+    {{ .Inner }}
+    <span class="date">
+        {{ if .IsNamedParams }}
+            {{ with .Get "from" }}
+            <time datetime="{{ . }} ">{{ . }}</time>
+            {{ end }}
+            to
+            {{ with .Get "to" }}
+            <time datetime="{{ . }}">{{ . }}</time>
+            {{ else }}
+            present
+            {{ end }}
+        {{ else }}
+            {{ .Get 0 }}
+        {{ end }}
+    </span>
+</header>
\ No newline at end of file
diff --git a/layouts/shortcodes/resume_section.html b/layouts/shortcodes/resume_section.html
index 1606b7a..4905bf1 100644
--- a/layouts/shortcodes/resume_section.html
+++ b/layouts/shortcodes/resume_section.html
@@ -1,4 +1,14 @@
 <header class="flex-date">
     <h3>{{ .Get "company" }}: {{ .Get "team" }}</h3>
-    <time class="date">{{ .Get "from" }} to {{ with .Get "to" }}{{ . }}{{ else }}present{{ end }}</time>
+    <span class="date">
+        {{ with .Get "from" }}
+        <time datetime="{{ . }} ">{{ . }}</time>
+        {{ end }}
+        to
+        {{ with .Get "to" }}
+        <time datetime="{{ . }}">{{ . }}</time>
+        {{ else }}
+        present
+        {{ end }}
+    </span>
 </header>
\ No newline at end of file