diff --git a/.gitignore b/.gitignore
index 93d9587..7137362 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,13 @@ phpunit.xml
 composer.lock
 
 # Build Artifacts
+phpunit.xml
+phpunit.phing.xml
 cache.properties
 build/
-!build/php*.xml
+!build/resources/*.xslt
+
+bin
 
 .idea/workspace.xml
 .idea/dataSources.xml
diff --git a/.idea/axstrad-content.iml b/.idea/axstrad-content.iml
index 79ae030..fc7e46d 100644
--- a/.idea/axstrad-content.iml
+++ b/.idea/axstrad-content.iml
@@ -4,8 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/bin" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/.idea/phing.xml b/.idea/phing.xml
new file mode 100644
index 0000000..cb53a0f
--- /dev/null
+++ b/.idea/phing.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhingConfiguration">
+    <buildFilePaths>
+      <buildFile options="" path="file://$PROJECT_DIR$/build.xml">
+        <targetsToHide>
+          <target value="prepare" />
+          <target value="phpdepend-human" />
+          <target value="phpdepend-ci" />
+          <target value="phpcs" />
+          <target value="phpunit" />
+          <target value="phpmd-report" />
+          <target value="phpmd-html" />
+          <target value="phpmd-xml" />
+          <target value="phpcpd-ci" />
+          <target value="phploc-ci" />
+          <target value="ci-tasks" />
+        </targetsToHide>
+      </buildFile>
+    </buildFilePaths>
+    <phingPath>$USER_HOME$/.composer/vendor/bin/phing</phingPath>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/webResources.xml b/.idea/webResources.xml
index 779b770..1f8ec26 100644
--- a/.idea/webResources.xml
+++ b/.idea/webResources.xml
@@ -7,6 +7,7 @@
           <resourceRoots>
             <path value="file://$PROJECT_DIR$/config" />
             <path value="file://$PROJECT_DIR$/vendor" />
+            <path value="file://$PROJECT_DIR$/build" />
           </resourceRoots>
         </entryData>
       </entry>
diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000..0ac0c91
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,58 @@
+version=0.0.0
+commit="none"
+name=${phing.project.name}
+summary="Summary"
+author.name="Dan Kempster"
+author.email="dev@dankempster.co.uk"
+author.username="dankempster"
+description="Description last commit ${commit}"
+
+global.vendor.bin=/Users/dan/.composer/vendor/bin
+global.bin=/usr/bin
+
+exec.php=${global.bin}/php
+exec.phing=${global.vendor.bin}/phing
+exec.phpdepend=${global.vendor.bin}/pdepend
+exec.phpcs=${global.vendor.bin}/phpcs
+exec.phpunit=${project.bin}/phpunit
+exec.phpmd=${global.vendor.bin}/phpmd
+exec.phpcpd=${global.vendor.bin}/phpcpd
+exec.phpdoc=${global.vendor.bin}/phpdoc
+exec.phpdox=${global.bin}/phpdox
+exec.phploc=${global.vendor.bin}/phploc
+
+project.src=${project.basedir}/src
+project.tests=${project.basedir}/tests
+project.vendor=${project.basedir}/src
+project.bin=${project.basedir}/bin
+project.docs=${project.basedir}/docs
+project.docs.api=${project.docs}/api
+
+build.root=${project.basedir}/build
+build.cache=${build.root}/cache
+build.tmp=${build.root}/tmp
+build.log=${build.root}/log
+build.html=${build.root}/html
+build.config=${build.root}/config
+build.resources=${build.root}/resources
+
+phpdepend.xml.file=${build.log}/phpdepend.xml
+phpdepend.html=${build.html}
+phpdepend.ignore=.git,tests/,build/
+
+phpcs.xml.file=${build.log}/phpcs.xml
+phpcs.html=${build.html}/phpcs
+
+phpunit.html=${build.html}/phpunit
+phpunit.config=${project.basedir}/phpunit.xml.dist
+phpunit.phing.config=${project.basedir}/phpunit.phing.xml
+
+phpmd.config=${build.config}/phpmd.xml
+phpmd.report.html=${build.html}/pmd.html
+phpmd.report.text=${build.html}/pmd.txt
+phpmd.report.xml=${build.log}/pmd.xml
+
+phpcpd.log.file=${build.log}/phpcpd.xml
+phpcpd.html=${build.html}/phpcpd
+
+phploc.log.file=${build.log}/phploc.xml
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..5c2b8f0
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,156 @@
+<project name="Axstrad/Content" default="all" basedir=".">
+    <property file="./build.properties"/>
+
+    <target name="prepare" depends="clean">
+        <mkdir dir="${build.tmp}"/>
+        <mkdir dir="${build.log}"/>
+        <mkdir dir="${build.cache}"/> <!-- Should NOT be part of 'clean' target -->
+        <mkdir dir="${build.html}"/>
+    </target>
+
+    <target name="clean">
+        <delete dir="${build.tmp}"/>
+        <delete dir="${build.log}"/>
+        <delete dir="${build.html}"/>
+    </target>
+
+    <target name="phpdepend-human"
+            description="Calculate software metrics using PHP_Depend and log result in XML format."
+            >
+        <mkdir dir="${build.html}"/>
+        <exec
+                command="${exec.phpdepend} --jdepend-chart=${build.html}/pdepend.svg --ignore=${phpdepend.ignore} --overview-pyramid=${build.html}/pyramid.svg ${project.src}"
+                dir="${project.src}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="phpdepend-ci"
+            depends="phpdepend-human"
+            description="Calculate software metrics using PHP_Depend and log result in XML format. Intended for usage within a continuous integration environment."
+            >
+        <exec
+                command="${exec.phpdepend} --jdepend-xml=${phpdepend.xml.file} --ignore=${phpdepend.ignore} ${project.src}"
+                dir="${project.src}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="phpcs">
+        <mkdir dir="${phpcs.html}"/>
+        <exec
+                command="${exec.phpcs} --report=checkstyle --report-file=${phpcs.xml.file} --standard=PEAR --extensions=php --ignore=.git/,doc/,resources/,build ${project.src}"
+                dir="${project.basedir}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="phpunit"
+            description="Runs the project's PHPUnit tests. Intended for use in a Continuous Integration environment."
+            >
+        <mkdir dir="${phpunit.html}"/>
+        <xslt
+                file="${phpunit.config}"
+                tofile="${phpunit.phing.config}"
+                style="${build.resources}/phpunit-phing.xslt"
+                />
+        <exec
+                command="${exec.phpunit} -c ${phpunit.phing.config}"
+                dir="${project.basedir}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="phpmd"
+            description="Intended for use by the command line before committing."
+            >
+        <exec
+                command="${exec.phpmd} ${project.src} text ${phpmd.config}"
+                dir="${project.basedir}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="phpmd-report"
+            description="Runs PHPMD against the project and outputs HTML and XML reports. Intended for internal use."
+            depends="phpmd-html,phpmd-xml"
+            />
+
+    <target name="phpmd-html"
+            >
+        <exec
+                command="${exec.phpmd} ${project.src} html ${phpmd.config} --reportfile ${phpmd.report.html} --suffixes=php"
+                dir="${project.basedir}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="phpmd-xml"
+            description="Runs PHPMD against the project and outputs HTML and XML reports. Intended for by a Continuous Integration environment."
+            >
+        <exec
+                command="${exec.phpmd} ${project.src} xml ${phpmd.config} --reportfile ${phpmd.report.xml} --suffixes=php"
+                dir="${project.basedir}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="phpcpd"
+            description="Find duplicate code using PHPCPD and print human readable output. Intended for usage on the command line before committing."
+            >
+        <exec
+                command="${exec.phpcpd} --verbose ${project.src}"
+                dir="${project.basedir}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="phpcpd-ci"
+            description="Find duplicate code using PHPCPD and log result in XML format. Intended for usage within a continuous integration environment."
+            >
+        <exec
+                command="${exec.phpcpd} --log-pmd ${phpcpd.log.file} --verbose ${project.src}"
+                dir="${project.basedir}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="phploc"
+            description="Measure project size using PHPLOC and print human readable output. Intended for usage from the command line before committing."
+            >
+        <exec
+                command="${exec.phploc} ${project.src} ${project.tests}"
+                dir="${project.basedir}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="phploc-ci"
+            description="Measure project size using PHPLOC and log result in CSV and XML format. Intended for usage within a continuous integration environment."
+            >
+        <exec
+                command="${exec.phploc} --count-tests --log-xml ${phploc.log.file} ${project.src} ${project.tests}  > ${build.html}/phploc.txt"
+                dir="${project.basedir}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="phpdox" depends="phpunit,phploc-ci,phpcs,phpmd-xml">
+        <exec
+                command="${exec.phpdox}"
+                dir="${project.basedir}"
+                passthru="true"
+                />
+    </target>
+
+    <target name="all" depends="clean, build, report, ci-tasks"/>
+
+    <!-- Intedned for use by humans -->
+    <target name="build" depends="prepare, test"/>
+    <target name="test" depends="prepare, phpunit"/>
+    <target name="report" depends="build, phploc, phpdepend-human, phpcs, phpmd-html, phpcpd, phpdox"/>
+
+    <!-- Intended for use by Continuous Integration environments -->
+    <target name="ci" depends="clean, ci-tasks"/>
+    <target name="ci-tasks" depends="test, phploc-ci, phpdepend-ci, phpcs, phpmd-xml, phpcpd-ci, phpdox"/>
+</project>
diff --git a/build/resources/phpunit-phing.xslt b/build/resources/phpunit-phing.xslt
new file mode 100644
index 0000000..6ba94b6
--- /dev/null
+++ b/build/resources/phpunit-phing.xslt
@@ -0,0 +1,26 @@
+<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="xml" indent="yes"/>
+
+    <xsl:template match="phpunit">
+        <phpunit>
+            <xsl:copy-of select="testsuites" />
+
+            <logging>
+                <!-- Apply other templates to the logging/log nodes (including the commented out ones) -->
+                <xsl:apply-templates select="logging/node()"/>
+            </logging>
+
+            <xsl:copy-of select="filter" />
+        </phpunit>
+    </xsl:template>
+
+    <!-- Matches the commented out <log type="coverage-xml"> line and outputs it -->
+    <xsl:template match="comment()[contains(., 'coverage-xml') or contains(., 'coverage-html')]">
+        <xsl:value-of select="." disable-output-escaping="yes"/> <!-- uncomments the log line -->
+    </xsl:template>
+
+    <!-- Matches all uncomments <log /> elements and outputs them -->
+    <!--<xsl:template match="log">
+        <xsl:copy-of select="." />
+    </xsl:template>-->
+</xsl:transform>
diff --git a/composer.json b/composer.json
index fa37cb9..13825fc 100644
--- a/composer.json
+++ b/composer.json
@@ -34,6 +34,10 @@
 
     "minimum-stability": "dev",
 
+    "config": {
+        "bin-dir": "bin"
+    },
+
     "extra": {
         "branch-alias": {
             "dev-develop": "0.4.x-dev"
diff --git a/phpdox.xml b/phpdox.xml
new file mode 100644
index 0000000..7f8ee79
--- /dev/null
+++ b/phpdox.xml
@@ -0,0 +1,40 @@
+<phpdox xmlns="http://phpdox.net/config">
+    <project name="axstrad/content" source="src" workdir="build/cache/phpdox">
+        <collector publiconly="false">
+            <include mask="*.php" />
+
+            <inheritance resolve="true">
+
+            </inheritance>
+        </collector>
+
+        <generator output="build/html">
+            <build engine="html" enabled="true" output="api">
+                <file extension="html" />
+            </build>
+
+            <enrich base="build/log">
+                <source type="phploc">
+                    <file name="phploc.xml"></file>
+                </source>
+
+                <source type="git">
+                    <git binary="/usr/bin/git" />
+                    <history enabled="true" limit="15" cache="${phpDox.project.workdir}/gitlog.xml" />
+                </source>
+
+                <source type="phpunit">
+                    <coverage path="phpunit-coverage"/>
+                </source>
+
+                <source type="phpcs">
+                    <file name="phpcs.xml" />
+                </source>
+
+                <source type="pmd">
+                    <file name="pmd.xml" />
+                </source>
+            </enrich>
+        </generator>
+    </project>
+</phpdox>
diff --git a/phpmd.xml b/phpmd.xml
new file mode 100644
index 0000000..1e870bf
--- /dev/null
+++ b/phpmd.xml
@@ -0,0 +1,11 @@
+<ruleset name="name-of-your-coding-standard"
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
+                      http://pmd.sf.net/ruleset_xml_schema.xsd"
+         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+    <description>Description of your coding standard</description>
+
+    <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
+    <!-- ... -->
+</ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e6d11dd..96f8222 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -18,17 +18,18 @@
     </testsuites>
 
     <logging>
-        <!-- <log type="coverage-html"
-             target="build/coverage/phpunit"
+        <!--<log type="coverage-html"
+             target="build/html/phpunit"
              title="Axstrad/Content"
              charset="UTF-8"
              yui="true"
              highlight="true"
              lowUpperBound="35"
              highLowerBound="70"
-        /> -->
-        <!-- <log type="coverage-clover" target="build/logs/clover.phpunit.xml"/> -->
-        <!-- <log type="junit" target="build/logs/junit.phpunit.xml" logIncompleteSkipped="false"/> -->
+        />-->
+         <!--<log type="coverage-xml" target="build/log/phpunit-coverage"/>-->
+         <log type="coverage-clover" target="build/log/clover.xml"/>
+         <!--<log type="junit" target="build/log/junit.xml" logIncompleteSkipped="false"/>-->
     </logging>
 
     <filter>