diff --git a/source/_layouts/speaker.html.twig b/source/_layouts/speaker.html.twig
index ddd8353..761849b 100644
--- a/source/_layouts/speaker.html.twig
+++ b/source/_layouts/speaker.html.twig
@@ -2,12 +2,49 @@
{% block title %}{{ page.name }}{% endblock %}
-{% block content_bottom %}
-
Session
+{% block content_wrapper_inner %}
+
+ {% if page.image %}
+
+

+
+ {% endif %}
- {% for session in data.sessions if page.name in session.speakers %}
-
- {{ session.title }}
-
- {% endfor %}
+
+ {% if page.links %}
+
+ {% if page.links.drupalorg %}
+
+ {% endif %}
+
+ {% if page.links.twitter %}
+
+ {% endif %}
+
+ {% endif %}
+
+
+ {% if page.organisation %}
+ Organisation: {{ page.organisation }}
+ {% endif %}
+
+ {% block content %}{% endblock %}
+
+
+
+{% endblock %}
+
+{% block content_bottom %}
+ Session
+
+ {% for session in data.sessions if page.name in session.speakers %}
+
+ {{ session.title }}
+
+ {% endfor %}
+
{% endblock %}
diff --git a/source/_speakers/tom-metcalfe.md b/source/_speakers/tom-metcalfe.md
index 8ba41b1..d651cbd 100644
--- a/source/_speakers/tom-metcalfe.md
+++ b/source/_speakers/tom-metcalfe.md
@@ -1,6 +1,8 @@
---
name: Tom Metcalfe
-twitter: tommymets9
+organisation: Reason Digital
+links:
+ twitter: tommymets9
use:
- sessions
---
diff --git a/source/themes/dcb2017/images/drop-1.png b/source/themes/dcb2017/images/drop-1.png
new file mode 100644
index 0000000..6f628d1
Binary files /dev/null and b/source/themes/dcb2017/images/drop-1.png differ
diff --git a/source/themes/dcb2017/images/twitter-1.png b/source/themes/dcb2017/images/twitter-1.png
new file mode 100644
index 0000000..9d65a77
Binary files /dev/null and b/source/themes/dcb2017/images/twitter-1.png differ