diff --git a/public/404 b/public/404
new file mode 100644
index 0000000..6b075fe
--- /dev/null
+++ b/public/404
@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<!--
+  Dan Barber's CV
+  Author: Dan Barber
+  URL: http://pixelhum.com/cv
+-->
+<html class='no-js' lang='en' manifest='default.appcache?v=1'>
+  <head>
+    <meta charset='utf-8' />
+    <title>Dan Barber - Web Developer &amp; Designer</title>
+    <meta content='' name='description' />
+    <meta content='' name='author' />
+    <!-- http://t.co/dKP3o1e -->
+    <meta content='True' name='HandheldFriendly' />
+    <meta content='320' name='MobileOptimized' />
+    <meta content='width=device-width, target-densitydpi=160dpi, initial-scale=1' name='viewport' />
+    <!--
+      For less capable mobile browsers
+      <link rel="stylesheet" media="handheld" href="css/handheld.css?v=1">
+    -->
+    <!-- For all browsers -->
+    <link href='css/style.css?v=1' rel='stylesheet' />
+    <!-- JavaScript at bottom except for Modernizr and Typekit -->
+    <script src='js/libs/modernizr-1.7.min.js'></script>
+    <!-- Typekit -->
+    <script src='http://use.typekit.com/ewi2mjz.js' type='text/javascript'></script>
+    <script type='text/javascript'>
+      //<![CDATA[
+        try{Typekit.load();}catch(e){}
+      //]]>
+    </script>
+    <link href='favicon.png' rel='shortcut icon' />
+    <!-- Microsoft. Delete if not required -->
+    <meta content='on' http-equiv='cleartype' />
+    <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible' />
+    <!-- http://t.co/y1jPVnT -->
+    <link href='/' rel='canonical' />
+  </head>
+  <body class='clearfix'>
+    <div id='stripe'>
+      <div class='container'>
+        <canvas height='12' id='colours' width='890'></canvas>
+      </div>
+    </div>
+    <header class='clearfix' role='banner'>
+      <div class='container'>
+        <h1 id='main_heading'>Dan Barber</h1>
+        <h2>Web Designer &amp;&nbsp;Developer</h2>
+      </div>
+    </header>
+    <!DOCTYPE html>
+
+<!-- 
+320 and Up boilerplate extension
+Author: Andy Clarke
+Version: 0.9b
+URL: http://stuffandnonsense.co.uk/projects/320andup 
+-->
+
+<!--[if IEMobile 7 ]><html class="no-js iem7" manifest="default.appcache?v=1"><![endif]-->
+<!--[if lt IE 7 ]><html class="no-js ie6" lang="en"><![endif]-->
+<!--[if IE 7 ]><html class="no-js ie7" lang="en"><![endif]-->
+<!--[if IE 8 ]><html class="no-js ie8" lang="en"><![endif]-->
+<!--[if (gte IE 9)|(gt IEMobile 7)|!(IEMobile)|!(IE)]><!--><html class="no-js" manifest="default.appcache?v=1" lang="en"><!--<![endif]-->
+
+<head>
+<meta charset="utf-8">
+
+<title>320 and up</title>
+<meta name="description" content="">
+<meta name="author" content="">
+
+<!-- http://t.co/dKP3o1e -->
+<meta name="HandheldFriendly" content="True">
+<meta name="MobileOptimized" content="320">
+<meta name="viewport" content="width=device-width, target-densitydpi=160dpi, initial-scale=1">
+
+<!-- For less capable mobile browsers
+<link rel="stylesheet" media="handheld" href="css/handheld.css?v=1">  -->
+
+<!-- For all browsers -->
+<link rel="stylesheet" href="css/style.css?v=1">
+
+<!-- JavaScript at bottom except for Modernizr -->
+<script src="js/libs/modernizr-1.7.min.js"></script>
+
+<!-- For iPhone 4 -->
+<link rel="apple-touch-icon-precomposed" sizes="114x114" href="img/h/apple-touch-icon.png">
+<!-- For iPad 1-->
+<link rel="apple-touch-icon-precomposed" sizes="72x72" href="img/m/apple-touch-icon.png">
+<!-- For iPhone 3G, iPod Touch and Android -->
+<link rel="apple-touch-icon-precomposed" href="img/l/apple-touch-icon-precomposed.png">
+<!-- For Nokia -->
+<link rel="shortcut icon" href="img/l/apple-touch-icon.png">
+<!-- For everything else -->
+<link rel="shortcut icon" href="/favicon.ico">
+
+<!--iOS. Delete if not required -->
+<meta name="apple-mobile-web-app-capable" content="yes">
+<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+<link rel="apple-touch-startup-image" href="img/splash.png">
+
+<!--Microsoft. Delete if not required -->
+<meta http-equiv="cleartype" content="on">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+
+<!-- http://t.co/y1jPVnT -->
+<link rel="canonical" href="/">
+</head>
+
+<body class="clearfix">
+
+<header role="banner" class="clearfix">
+<h1>320 and up</h1>
+</header>
+
+<div class="content clearfix">
+
+<h1>Page not found</h1>
+
+<div role="main">
+<p>Sorry, but the page you&#8217;re looking for doesn&#8217;t not exist.</p>
+<p>It looks like this was either the result of:</p>
+
+<ul>
+<li>A mis-typed address</li>
+<li>An out-of-date link</li>
+</ul>
+ 
+<script>var GOOG_FIXURL_LANG = (navigator.language || '').slice(0,2), GOOG_FIXURL_SITE = location.host;</script>
+<script src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
+</div>
+
+<div role="complimentary">
+</div>
+
+</div>
+
+<footer role="contentinfo" class="clearfix">
+</footer>
+
+<!-- mathiasbynens.be/notes/async-analytics-snippet Change UA-XXXXX-X to be your site's ID -->
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js"></script>
+<script>window.jQuery || document.write('<script src="js/libs/jquery-1.5.1.min.js">\x3C/script>')</script>
+<!-- Scripts -->
+<script src="js/plugins.js"></script>
+<script src="js/script.js"></script>
+
+<!--[if (lt IE 9) & (!IEMobile)]>
+<script src="js/libs/DOMAssistantCompressed-2.8.js"></script>
+<script src="js/libs/selectivizr-1.0.1.js"></script>
+<script src="js/libs/respond.min.js"></script>
+<![endif]-->
+
+<!-- http://t.co/HZe9oJ4 -->
+<script>
+var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']]; // Change UA-XXXXX-X to be your site's ID
+(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
+g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+s.parentNode.insertBefore(g,s)}(document,'script'));
+</script>
+<noscript>Your browser does not support JavaScript!</noscript>
+</body>
+</html>
+    <footer class='clearfix' role='contentinfo'></footer>
+<!-- mathiasbynens.be/notes/async-analytics-snippet Change UA-XXXXX-X to be your site's ID -->
+<script src='//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js'></script>
+<script type='text/javascript'>
+  //<![CDATA[
+    window.jQuery || document.write('<script src="js/libs/jquery-1.5.1.min.js">\x3C/script>')    / Scripts
+  //]]>
+</script>
+<script src='js/plugins.js'></script>
+<script src='js/script.js'></script>
+<!--[if (lt IE 9) & (!IEMobile)]>
+  <script src="js/libs/DOMAssistantCompressed-2.8.js"></script>
+  <script src="js/libs/selectivizr-1.0.1.js"></script>
+  <script src="js/libs/respond.min.js"></script>
+<![endif]-->
+<!-- http://t.co/HZe9oJ4 -->
+<script type='text/javascript'>
+  //<![CDATA[
+    var _gaq=[['_setAccount','UA-603600-3'],['_trackPageview']]; // Change UA-XXXXX-X to be your site's ID
+    (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
+    g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+    s.parentNode.insertBefore(g,s)}(document,'script'));
+  //]]>
+</script>
+<noscript>Your browser does not support JavaScript!</noscript>
+  </body>
+</html>
diff --git a/public/index.html b/public/index.html
index 4d6dc54..f757a52 100644
--- a/public/index.html
+++ b/public/index.html
@@ -54,7 +54,7 @@
       <section id='profile'>
         <h3>Profile</h3>
 
-<p>I have 12 years of experience building web sites and web applications, from small simple websites and services to large enterprise level systems. I focus on simple, usable interfaces and prefer to work by prototyping ideas.</p>
+<p>I have 14 years of experience building web sites and web applications, from small simple websites and services to large enterprise level systems. I focus on simple, usable interfaces and prefer to work by prototyping ideas.</p>
 
 <p>I am detail orientated and I love working alongside others on interesting projects and ideas. I love learning new techniques and technologies and I love simple, elegant, maintainable code.</p>
       </section>
@@ -193,26 +193,17 @@
       </section>
       <section class='vcard' id='contact'>
         <h3>Contact</h3>
-<p class='fn n'>
-  <span class='given-name'>Dan</span>
-  <span class='family-name'>Barber</span>
-</p>
-<p class='adr'>
-  <span class='street-address'>41D Longacre</span>
-  <br />
-  <span class='locality'>Plymouth</span>
-  <br />
-  <span class='postal-code'>PL7 4RQ</span>
-  <br />
-  <span class='country-name'>United Kingdom</span>
-</p>
-<p>
-  <a class='email' href='mailto:dan.barber@pixelhum.com'>dan.barber@pixelhum.com</a>
-</p>
-<p class='tel'>+44 (0) 1752 546981</p>
-<p>
-  <a class='url' href='http://pixelhum.com'>http://pixelhum.com</a>
-</p>
+        <p class='fn n'>
+          <span class='given-name'>Dan</span>
+          <span class='family-name'>Barber</span>
+        </p>
+        <p>
+          <a class='email' href='mailto:cv@danbarber.me'>cv@danbarber.me</a>
+        </p>
+        <p class='tel'>+44 (0) 1752 546981</p>
+        <p>
+          <a class='url' href='http://pixelhum.com'>http://danbarber.me</a>
+        </p>
       </section>
     </div>
   </div>
diff --git a/public/sections/contact.html b/public/sections/contact.html
index 1234fa7..2309faf 100644
--- a/public/sections/contact.html
+++ b/public/sections/contact.html
@@ -49,26 +49,17 @@
       </div>
     </header>
     <h3>Contact</h3>
-<p class='fn n'>
-  <span class='given-name'>Dan</span>
-  <span class='family-name'>Barber</span>
-</p>
-<p class='adr'>
-  <span class='street-address'>41D Longacre</span>
-  <br />
-  <span class='locality'>Plymouth</span>
-  <br />
-  <span class='postal-code'>PL7 4RQ</span>
-  <br />
-  <span class='country-name'>United Kingdom</span>
-</p>
-<p>
-  <a class='email' href='mailto:dan.barber@pixelhum.com'>dan.barber@pixelhum.com</a>
-</p>
-<p class='tel'>+44 (0) 1752 546981</p>
-<p>
-  <a class='url' href='http://pixelhum.com'>http://pixelhum.com</a>
-</p>
+    <p class='fn n'>
+      <span class='given-name'>Dan</span>
+      <span class='family-name'>Barber</span>
+    </p>
+    <p>
+      <a class='email' href='mailto:cv@danbarber.me'>cv@danbarber.me</a>
+    </p>
+    <p class='tel'>+44 (0) 1752 546981</p>
+    <p>
+      <a class='url' href='http://pixelhum.com'>http://danbarber.me</a>
+    </p>
     <footer class='clearfix' role='contentinfo'></footer>
 <!-- mathiasbynens.be/notes/async-analytics-snippet Change UA-XXXXX-X to be your site's ID -->
 <script src='//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js'></script>
diff --git a/public/sections/profile b/public/sections/profile
index 748feba..bd98da4 100644
--- a/public/sections/profile
+++ b/public/sections/profile
@@ -50,7 +50,7 @@
     </header>
     <h3>Profile</h3>
 
-<p>I have 12 years of experience building web sites and web applications, from small simple websites and services to large enterprise level systems. I focus on simple, usable interfaces and prefer to work by prototyping ideas.</p>
+<p>I have 14 years of experience building web sites and web applications, from small simple websites and services to large enterprise level systems. I focus on simple, usable interfaces and prefer to work by prototyping ideas.</p>
 
 <p>I am detail orientated and I love working alongside others on interesting projects and ideas. I love learning new techniques and technologies and I love simple, elegant, maintainable code.</p>
     <footer class='clearfix' role='contentinfo'></footer>
diff --git a/public/test/index b/public/test/index
new file mode 100644
index 0000000..8cbe8e3
--- /dev/null
+++ b/public/test/index
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<!--
+  Dan Barber's CV
+  Author: Dan Barber
+  URL: http://pixelhum.com/cv
+-->
+<html class='no-js' lang='en' manifest='default.appcache?v=1'>
+  <head>
+    <meta charset='utf-8' />
+    <title>Dan Barber - Web Developer &amp; Designer</title>
+    <meta content='' name='description' />
+    <meta content='' name='author' />
+    <!-- http://t.co/dKP3o1e -->
+    <meta content='True' name='HandheldFriendly' />
+    <meta content='320' name='MobileOptimized' />
+    <meta content='width=device-width, target-densitydpi=160dpi, initial-scale=1' name='viewport' />
+    <!--
+      For less capable mobile browsers
+      <link rel="stylesheet" media="handheld" href="css/handheld.css?v=1">
+    -->
+    <!-- For all browsers -->
+    <link href='css/style.css?v=1' rel='stylesheet' />
+    <!-- JavaScript at bottom except for Modernizr and Typekit -->
+    <script src='js/libs/modernizr-1.7.min.js'></script>
+    <!-- Typekit -->
+    <script src='http://use.typekit.com/ewi2mjz.js' type='text/javascript'></script>
+    <script type='text/javascript'>
+      //<![CDATA[
+        try{Typekit.load();}catch(e){}
+      //]]>
+    </script>
+    <link href='favicon.png' rel='shortcut icon' />
+    <!-- Microsoft. Delete if not required -->
+    <meta content='on' http-equiv='cleartype' />
+    <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible' />
+    <!-- http://t.co/y1jPVnT -->
+    <link href='/' rel='canonical' />
+  </head>
+  <body class='clearfix'>
+    <div id='stripe'>
+      <div class='container'>
+        <canvas height='12' id='colours' width='890'></canvas>
+      </div>
+    </div>
+    <header class='clearfix' role='banner'>
+      <div class='container'>
+        <h1 id='main_heading'>Dan Barber</h1>
+        <h2>Web Designer &amp;&nbsp;Developer</h2>
+      </div>
+    </header>
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+    	<title>QUnit Tests</title>
+    	<link rel="stylesheet" href="qunit/qunit.css" media="screen">
+    
+    <!-- reference your own javascript files here -->
+    
+      <script src="../js/libs/modernizr-1.7.min.js"></script>
+      
+      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script> 
+      <script src="../js/plugins.js"></script> 
+      <script src="../js/script.js"></script> 
+    
+    
+    <!-- test runner files -->
+    	<script src="qunit/qunit.js"></script>
+    	<script src="tests.js"></script>
+    
+    
+    
+    </head>
+    <body class="flora">
+    	<h1 id="qunit-header">QUnit Test Suite</h1>
+    	<h2 id="qunit-banner"></h2>
+    	<div id="qunit-testrunner-toolbar"></div>
+    	<h2 id="qunit-userAgent"></h2>
+    	<ol id="qunit-tests"></ol>
+    	<div id="qunit-fixture">test markup</div>
+    	</body>
+    </html>
+    <footer class='clearfix' role='contentinfo'></footer>
+<!-- mathiasbynens.be/notes/async-analytics-snippet Change UA-XXXXX-X to be your site's ID -->
+<script src='//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js'></script>
+<script type='text/javascript'>
+  //<![CDATA[
+    window.jQuery || document.write('<script src="js/libs/jquery-1.5.1.min.js">\x3C/script>')    / Scripts
+  //]]>
+</script>
+<script src='js/plugins.js'></script>
+<script src='js/script.js'></script>
+<!--[if (lt IE 9) & (!IEMobile)]>
+  <script src="js/libs/DOMAssistantCompressed-2.8.js"></script>
+  <script src="js/libs/selectivizr-1.0.1.js"></script>
+  <script src="js/libs/respond.min.js"></script>
+<![endif]-->
+<!-- http://t.co/HZe9oJ4 -->
+<script type='text/javascript'>
+  //<![CDATA[
+    var _gaq=[['_setAccount','UA-603600-3'],['_trackPageview']]; // Change UA-XXXXX-X to be your site's ID
+    (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
+    g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+    s.parentNode.insertBefore(g,s)}(document,'script'));
+  //]]>
+</script>
+<noscript>Your browser does not support JavaScript!</noscript>
+  </body>
+</html>
