diff --git a/source/talks.html.twig b/source/talks.html.twig
new file mode 100644
index 00000000..e6c78926
--- /dev/null
+++ b/source/talks.html.twig
@@ -0,0 +1,15 @@
+---
+layout: default
+title: Talks
+use:
+ - talks
+---
+
+Talks
+
+
+ {% for talk in data.talks %}
+ - {{ talk.date|date('F Y') }} - {{ talk.location|raw }}
+ - {{ talk.title }}
+ {% endfor %}
+
\ No newline at end of file
diff --git a/source/talks.md b/source/talks.md
deleted file mode 100644
index f930e16c..00000000
--- a/source/talks.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-layout: default
-title: Talks
-nav: talks
-use:
- - posts
-meta:
- description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups.'
----
-# Talks
-
-
-
-## Previous Talks
-
-April 2015 - [PHPSW](http://phpsw.org.uk/events/221484360-lightning-talks)
-: [Drupal 8](https://speakerdeck.com/opdavies/drupal-8) (lightning talk)
-
-February 2015 - [DrupalCamp London](http://2015.drupalcamplondon.co.uk)
-: Drupal.org in 2015: What's coming next?
-
-January 2015 - [DrupalCamp Brighton](http://www.drupalcampbrighton.co.uk/drupalcamp-brighton-2015/)
-: Drupal.org in 2015: What's coming next?
-
-August 2014 - South Wales Drupal User Group
-: An impromptu talk about the [Drupal Association](https://assoc.drupal.org) and I've done there since joining the team.
-
-July 2014 - Drupal Bristol
-: [drush make drupalbristol](/blog/drush-make-drupalbristol): An introduction to Drush and Drush Make
-
-March 2014 - [DrupalCamp London](http://2014.drupalcamplondon.co.uk)
-: [Never Commit to Master](/blog/what-git-flow): An Introduction to Git Flow
-
-July 2013 - South Wales Drupal User Group
-: An overview of the [Drupal LDAP module](http://www.drupal.org/project/ldap) and how I customised it for a client project.
-
-September 2012 - [unified.diff](http://unifieddiff.co.uk)
-: [So, what is this Drupal thing?](http://vimeo.com/49827006) - an introduction to Drupal.