diff --git a/_data/teaching.yml b/_data/teaching.yml
new file mode 100644
index 00000000..72958376
--- /dev/null
+++ b/_data/teaching.yml
@@ -0,0 +1,81 @@
+- title: Courses taught
+  type: time_table
+  contents:
+    - title: COMP 416/519: Genome scale algorithms (Senior Software Design)
+      institution: Department of Computer Science, Rice University
+      year: 2024
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+   - title: COMP 182: Algorithmic Thinking
+      institution: Department of Computer Science, Rice University
+      year: 2024
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+   - title: COMP 416/519: Genome scale algorithms (Senior Software Design)
+      institution: Department of Computer Science, Rice University
+      year: 2023
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+   - title: COMP 182: Algorithmic Thinking
+      institution: Department of Computer Science, Rice University
+      year: 2023
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+   - title: COMP 416/519
+      institution: Department of Computer Science, Rice University
+      year: 2022
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+   - title: COMP 182
+      institution: Department of Computer Science, Rice University
+      year: 2022
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+   - title: COMP 416/519
+      institution: Department of Computer Science, Rice University
+      year: 2021
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+   - title: COMP 347/547
+      institution: Department of Computer Science, Rice University
+      year: 2021
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+   - title: COMP 416/519
+      institution: Department of Computer Science, Rice University
+      year: 2020
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+   - title: COMP 347/547
+      institution: Department of Computer Science, Rice University
+      year: 2020
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+  - title: COMP 416/519
+      institution: Department of Computer Science, Rice University
+      year: 2019
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+   - title: COMP 347/547
+      institution: Department of Computer Science, Rice University
+      year: 2019
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
+   - title: CMSC 423: Introduction to Bioinformatics Algorithms and Databases
+      institution: Department of Computer Science, Rice University
+      year: 2015
+      description:
+        - Focus on bioinformatics and computational biology.
+        - Research involved the development of algorithms for genome analysis.
\ No newline at end of file
diff --git a/_layouts/teaching.liquid b/_layouts/teaching.liquid
new file mode 100644
index 00000000..d52c75c7
--- /dev/null
+++ b/_layouts/teaching.liquid
@@ -0,0 +1,94 @@
+---
+layout: default
+---
+{% unless site.data.resume %}
+  <div class="post">
+    <header class="post-header">
+      <h1 class="post-title">
+        {{ page.title }}
+      </h1>
+      {% if page.description %}
+        <p class="post-description">{{ page.description }}</p>
+      {% endif %}
+    </header>
+
+    <article>
+      <div class="teaching">
+        {% for entry in site.data.teaching %}
+          <a class="anchor" id="{{ entry.title }}"></a>
+          <div class="card mt-3 p-3">
+            <h3 class="card-title font-weight-medium">{{ entry.title }}</h3>
+            <div>
+              {% if entry.type == 'list' %}
+                {% include teaching/list.liquid %}
+              {% elsif entry.type == 'map' %}
+                {% include teaching/map.liquid %}
+              {% elsif entry.type == 'nested_list' %}
+                {% include teaching/nested_list.liquid %}
+              {% elsif entry.type == 'time_table' %}
+                {% include teaching/time_table.liquid %}
+              {% elsif entry.type == 'list_groups' %}
+                {% include teaching/list_groups.liquid %}
+              {% else %}
+                {{ entry.contents }}
+              {% endif %}
+            </div>
+          </div>
+        {% endfor %}
+      </div>
+    </article>
+  </div>
+{% else %}
+  <div class="post">
+    <header class="post-header">
+      <h1 class="post-title">
+        {{ page.title }}
+      </h1>
+      {% if page.description %}
+        <p class="post-description">{{ page.description }}</p>
+      {% endif %}
+    </header>
+
+    <article>
+      <div class="teaching">
+        {% for data in site.data.teaching %}
+          {% if data[0] == 'meta' or data[1].size == 0 %} {% continue %} {% endif %}
+          <a class="anchor" id="{{ data[0] }}"></a>
+          <div class="card mt-3 p-3">
+            <h3 class="card-title font-weight-medium">{{ data[0] | capitalize }}</h3>
+            <div>
+              {% case data[0] %}
+                {% when 'basics' %}
+                  {% include resume/basics.liquid %}
+                {% when 'education' %}
+                  {% include resume/education.liquid %}
+                {% when 'work' %}
+                  {% include resume/work.liquid %}
+                {% when 'volunteer' %}
+                  {% include resume/volunteer.liquid %}
+                {% when 'projects' %}
+                  {% include resume/projects.liquid %}
+                {% when 'awards' %}
+                  {% include resume/awards.liquid %}
+                {% when 'skills' %}
+                  {% include resume/skills.liquid %}
+                {% when 'publications' %}
+                  {% include resume/publications.liquid %}
+                {% when 'languages' %}
+                  {% include resume/languages.liquid %}
+                {% when 'interests' %}
+                  {% include resume/interests.liquid %}
+                {% when 'certificates' %}
+                  {% include resume/certificates.liquid %}
+                {% when 'references' %}
+                  {% include resume/references.liquid %}
+                {% else %}
+
+              {% endcase %}
+            </div>
+          </div>
+        {% endfor %}
+      </div>
+    </article>
+  </div>
+{% endunless %}
diff --git a/_pages/teaching.md b/_pages/teaching.md
index 4d1974ec..667dac5d 100644
--- a/_pages/teaching.md
+++ b/_pages/teaching.md
@@ -1,19 +1,10 @@
 ---
-layout: page
+layout: cv
 permalink: /teaching/
-title: teaching
-description: Rice CS courses taught by Prof. Treangen
+title: Teaching
 nav: true
-nav_order: 5
----
-
-Classes I'm currently teaching (Fall 2024):
-- COMP 416/519: Genome-scale algorithms
-
-Upcoming classes (Spring 2025):
-- COMP 182: Algorithmic Thinking
-
-Classes I've previously taught at Rice:
-- COMP 182 during Spring 2022, 2023, 2024
-- COMP 347/547 during Spring 2019, 2020, 2021
-- COMP 416/519 during Fall 2020, 2021, 2022, 2023, 2024
+nav_order: 6
+description: Courses taught
+toc:
+  sidebar: left
+---
\ No newline at end of file