diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
index 05cdc69f..fd726d63 100644
--- a/app/config/sculpin_site.yml
+++ b/app/config/sculpin_site.yml
@@ -10,7 +10,7 @@ author:
         role: Lead Drupal Developer
         name: CTI Digital
         website: https://www.ctidigital.com
-
+        logo: cti-digital.png
 twitter:
     url: http://twitter.com/opdavies
     name: opdavies
@@ -79,19 +79,26 @@ availability:
             no: <i class="fa fa-thumbs-o-down text-danger"></i> Not availabile for weekend/evening freelance work
 
 companies:
+    freelance:
+        title: Freelance
     horse_country:
         title: 'Horse & Country TV'
+        logo: horse-and-country.jpg
+        website: http://www.horseandcountry.tv
     zooba:
         title: Zooba Ltd
     proctors:
         title: 'Proctor & Stevenson'
         website: http://www.proctors.co.uk
+        logo: proctors.jpg
     nomensa:
         title: Nomensa
         website: http://www.nomensa.com
+        logo: nomensa.png
     precedent:
         title: Precedent
         website: http://precedent.com
+        logo: precedent.jpg
     trent:
         title: Trent Design
         website: http://www.trentdesign.net
@@ -101,6 +108,12 @@ companies:
     drupal_association:
         title: Drupal Association
         website: https://assoc.drupal.org
+        logo: drupal-association.png
     microserve:
         title: Microserve
         website: https://microserve.io
+        logo: microserve.png
+    cti:
+        title: CTI Digital
+        website: https://www.ctidigital.com
+        logo: cti-digital.png
diff --git a/source/experience.html.twig b/source/experience.html.twig
index 2268b2c8..5bdd1663 100644
--- a/source/experience.html.twig
+++ b/source/experience.html.twig
@@ -3,15 +3,13 @@ layout: default
 title: Experience
 nav: experience
 experiences:
-    - name: CTI Digital
-      website: https://www.ctidigital.com
-      logo: cti-digital.png
+    - company: cti
       role: Lead Drupal Developer
       location: Remote
       start: November 2015
       end: ~
 
-    - name: Freelance
+    - company: freelance
       location: Remote
       role: 'Drupal/PHP Developer & System Administrator'
       start: 2007
@@ -20,10 +18,8 @@ experiences:
           <p>Working on Drupal and PHP projects in my spare time.</p>
           <p>Linux server administration and configuration using Puppet, and more recently, Ansible.</p>
 
-    - name: Microserve
-      website: https://microserve.io
+    - company: microserve
       location: Bristol, England
-      logo: microserve.png
       role: Senior Drupal Developer
       start: July 2015
       end: November 2015
@@ -31,9 +27,7 @@ experiences:
           <p>Full-stack Drupal development, focussing on data migration.</p>
           <p>Community and contribution advocate.</p>
 
-    - name: Drupal Association
-      website: https://assoc.drupal.org
-      logo: drupal-association.png
+    - company: drupal_association
       role: Drupal.org Developer
       location: Remote
       start: 2014
@@ -42,20 +36,16 @@ experiences:
           <p>Maintaining and improving Drupal.org - the home of the Drupal community.</p>
           <p>Speaking at user groups and DrupalCamps to promote the Drupal Association.</p>
 
-    - name: Precedent
-      website: http://precedent.com
+    - company: precedent
       location: Cardiff, Wales
-      logo: precedent.jpg
       role: Senior Drupal Developer
       start: 2013
       end: 2014
       description: >
           <p>Drupal 7 website development, including site building, theming, module development, data migration and server configuration.</p>
 
-    - name: Nomensa
-      website: http://www.nomensa.com
+    - company: nomensa
       location: Bristol, England
-      logo: nomensa.png
       role: 'Contract Drupal Developer / Application Developer & System Administrator'
       start: 2012
       end: 2013
@@ -63,20 +53,16 @@ experiences:
           <p>Drupal 7 website development and Linux server administration.</p>
           <p>I originally started as a contractor, and later took a staff role.</p>
 
-    - name: 'Proctor & Stevenson'
-      website: http://www.proctors.co.uk
+    - company: proctors
       location: Bristol, England
-      logo: proctors.jpg
       role: 'PHP Developer'
       start: 2011
       end: 2012
       description: >
           <p>Website development, mainly with Drupal and PHP, including the agency’s first Drupal 7 project.</p>
 
-    - name: 'Horse & Country TV'
-      website: http://www.horseandcountry.tv
+    - company: horse_country
       location: Cwmbran, Wales
-      logo: horse-and-country.jpg
       role: Web Developer
       start: 2010
       end: 2011
@@ -88,17 +74,19 @@ experiences:
 {% for experiences in page.experiences|batch(2) %}
     <div class="row">
         {% for experience in experiences %}
-            <div class="experience col-md-6">
-                <h2>{{ experience.name }}</h2>
+            {% set company = site.companies[experience.company] %}
 
-                {% if experience.logo %}
-                    <img class="experience--logo" src="{{ site.images_url }}/assets/images/experience/{{ experience.logo }}" alt="{{ experience.name }} logo">
+            <div class="experience col-md-6">
+                <h2>{{ company.title }}</h2>
+
+                {% if company.logo %}
+                    <img class="experience--logo" src="{{ site.images_url }}/assets/images/experience/{{ company.logo }}" alt="{{ company.title }} logo">
                 {% endif %}
 
-                {% if experience.website %}
+                {% if company.website %}
                     <div>
-                        <a href="{{ experience.website }}">
-                            {{ experience.website }}
+                        <a href="{{ company.website }}">
+                            {{ company.website }}
                         </a>
                     </div>
                 {% endif %}