From 08cf2d3640a3b2d8f82ac18f11781c7b7878d868 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Wed, 8 Sep 2021 18:21:37 +0100
Subject: [PATCH] v2 (#229)

* remove all obsolete classes

* upgrade dependencies

* feature: DataBinder::bindValue()

* tweak: update exception messages

* tweak: remove unused imports

* refactor: share functionality for setting bind property

* refactor: simplify functionality

* refactor: rename to DocumentBinder

* tweak: rename test function names

* refactor: simplify nested foreach

* docs: update features

* tweak: import fqn

* refactor: remove ott checks for invalid properties

* feature: bindData

* feature: DocumentBinder::bindData() toggles DOMTokenList values

* feature: DocumentBinder::bindData() toggles boolean values

* feature: DocumentBinder::bindData() toggles boolean values with inverse logic from ! char

* feature: binding tabular data to a table element

* wip: table data normalisation

* feature: normalise table data

* feature: implement "double header" table data

* test: exception if indexed array passed to bindData

* test: bindData with stdClass object

* test: bindKeyValue with incorrect table data

* test: bindKeyValue with non-iterable double header table data

* tweak: change data type to int in example

* test: bindKeyValue throw error when tableData is assoc without iterable cols

* test: bindKeyValue throw error when binding tableData with no table in html

* wip: add todos to get bindTable to 100%

* test: various table tests to ensure table data is normalised correctly

* test: bindTable with header keys in the HTML

* tweak: remove unused code

* refactor: extract table binding into separate class

* test: bindKeyValue with table data

* tidy: remove unused imports

* tidy: more accurate test names

* refactor: extract element-specific binding to ElementBinder

* feature: ListBinder basic list bound to document

* feature: ListBinder binds text from values

* feature: ListBinder binds templates by name

* test: better working with empty lists

* feature: binding an empty list will clear the innerHTML of the template's parent

* test: binding a table to the document, rather than a specific element

* feature: bind list of key-value-pair arrays

* feature: bind list of key-value-pair objects

* feature: bind list of key-value-pair instance objects

* feature: Bind attribute used to mark methods/properties as dom-bindable

* feature: get a template element by its document position

* feature: throw exception if matching template is not found

* feature: get template element by template name

* feature: throw exceptions when names are not set correctly

* feature: bind text placeholder

* test: bind text placeholder's context does not leak

* feature: remove filtering feature from HTML

* feature: placeholders within attributes

* tweak: more appropriate naming

* improvement: binding nested elements resolve their template parents properly

* feature: nested lists with implicit keys

* refactor: update bind model - extract placeholder binding to separate classes

* feature: complete refactor of PlaceholderBinder

* test: DocumentBinder::bindList()

* test: HTMLAttributeBinder::bind() with Document context

* tweak: rename context to element when not performing a child search

* test: ListBinder::isKVP()

* chore: remove unused function

* chore: remove obsolete conditional

* test: ensure template names can't start with a forward slash

* chore: work through PHPStan's issues

* test: add a real-world test for todo items

* test: ensure template's siblings are not also templates

* feature: parse ini data within comments

* tweak: document type of array

* feature: expand custom elements

* feature: expand custom elements recursively

* feature: expand partials

* test: harden test cases

* wip: recursive partial expansion

* feature: recursive partial expansion

* feature: recursive partials import deepest title

* chore: update deps

* chore: update deps

* phpstan: fix generics issue

* remove unused test (from v1)

* build: upgrade deps
---
 README.md                                     |  78 +-
 composer.json                                 |  12 +-
 composer.lock                                 | 332 ++++++--
 example/01-example-groceries.html             |   6 -
 example/01-example-groceries.php              |  20 -
 example/_component/shopping-list.html         |   3 -
 src/Attr.php                                  |  22 -
 src/Bind.php                                  |  12 +
 src/BindDataMapper.php                        |  15 -
 src/BindObject.php                            |  15 -
 src/Bindable.php                              | 588 -------------
 src/BoundAttributeDoesNotExistException.php   |   4 -
 src/BoundDataNotSetException.php              |   4 -
 src/CharacterData.php                         |   8 -
 src/ChildNode.php                             |   7 -
 src/Comment.php                               |   6 -
 src/CommentIni.php                            |  75 ++
 ...entIniInvalidDocumentLocationException.php |   4 +
 src/CommentIniSyntaxErrorException.php        |   4 +
 src/ComponentExpander.php                     |  43 +
 src/DataKeyMatch.php                          |  49 --
 src/Document.php                              |  42 -
 src/DocumentBinder.php                        | 122 +++
 src/DocumentFragment.php                      |  60 --
 src/DocumentType.php                          |   8 -
 src/DomTemplateException.php                  |   4 +-
 src/Element.php                               |  48 --
 src/ElementBinder.php                         | 108 +++
 src/HTMLAttributeBinder.php                   | 233 +++++
 src/HTMLAttributeCollection.php               |  14 +
 src/HTMLCollection.php                        |  10 -
 src/HTMLDocument.php                          | 248 ------
 src/IncompatibleBindDataException.php         |   4 +-
 src/IncorrectTableDataFormat.php              |   4 +
 src/InvalidBindProperty.php                   |   4 -
 src/InvalidBindPropertyException.php          |   5 +
 src/InvalidTemplateElementNameException.php   |   4 +
 src/ListBinder.php                            | 152 ++++
 src/ModularContent.php                        |  27 +
 ...dularContentDirectoryNotFoundException.php |   4 +
 src/ModularContentExpander.php                |  15 +
 src/ModularContentFileNotFoundException.php   |   4 +
 src/NamelessTemplateSpecificityException.php  |   4 -
 src/Node.php                                  |  23 -
 src/NodeList.php                              |  11 -
 src/NodePathCalculator.php                    |  22 +
 src/NonDocumentTypeChildNode.php              |  12 -
 src/ParentNode.php                            |  30 -
 src/PartialExpander.php                       |  65 ++
 src/PlaceholderBinder.php                     |  51 ++
 src/PlaceholderText.php                       |  46 +
 src/StringMap.php                             |   6 -
 src/TableBinder.php                           | 179 ++++
 ...TableElementNotFoundInContextException.php |   4 +
 src/TemplateCollection.php                    |  91 ++
 src/TemplateComponentNotFoundException.php    |   4 -
 src/TemplateElement.php                       |  96 +++
 src/TemplateElementNotFoundFoundException.php |   4 -
 ...plateElementNotFoundInContextException.php |   4 +
 src/TemplateHasNoParentException.php          |   4 -
 src/TemplateParent.php                        | 248 ------
 src/Text.php                                  |   6 -
 src/TokenList.php                             |   6 -
 src/UnbindableObjectException.php             |   4 -
 test/phpunit/BindDataGetterTest.php           |  24 -
 test/phpunit/BindableTest.php                 | 795 ------------------
 test/phpunit/CommentIniTest.php               |  46 +
 test/phpunit/ComponentExpanderTest.php        |  49 ++
 test/phpunit/DocumentBinderTest.php           | 378 +++++++++
 test/phpunit/DocumentTest.php                 |  20 -
 test/phpunit/HTMLAttributeBinderTest.php      |  15 +
 test/phpunit/HTMLDocumentTest.php             |  21 -
 .../Helper/BindDataGetter/TodoItem.php        |  37 -
 test/phpunit/Helper/Helper.php                | 770 -----------------
 test/phpunit/Helper/TodoItemExampleObject.php |  12 -
 test/phpunit/Helper/TodoListExampleObject.php |  45 -
 test/phpunit/ListBinderTest.php               | 492 +++++++++++
 test/phpunit/ModularContentTest.php           |  66 ++
 test/phpunit/ModularContentTestCase.php       |  44 +
 test/phpunit/PartialExpanderTest.php          |  93 ++
 test/phpunit/PlaceholderBinderTest.php        |  49 ++
 test/phpunit/TableBinderTest.php              | 376 +++++++++
 test/phpunit/TemplateCollectionTest.php       | 118 +++
 test/phpunit/TemplateElementTest.php          |  20 +
 test/phpunit/TemplateParentTest.php           | 490 -----------
 test/phpunit/TestCase.php                     |  23 -
 test/phpunit/TestData.php                     |  97 +++
 .../TestFactory/DocumentTestFactory.php       | 499 +++++++++++
 88 files changed, 4046 insertions(+), 3880 deletions(-)
 delete mode 100644 example/01-example-groceries.html
 delete mode 100644 example/01-example-groceries.php
 delete mode 100644 example/_component/shopping-list.html
 delete mode 100644 src/Attr.php
 create mode 100644 src/Bind.php
 delete mode 100644 src/BindDataMapper.php
 delete mode 100644 src/BindObject.php
 delete mode 100644 src/Bindable.php
 delete mode 100644 src/BoundAttributeDoesNotExistException.php
 delete mode 100644 src/BoundDataNotSetException.php
 delete mode 100644 src/CharacterData.php
 delete mode 100644 src/ChildNode.php
 delete mode 100644 src/Comment.php
 create mode 100644 src/CommentIni.php
 create mode 100644 src/CommentIniInvalidDocumentLocationException.php
 create mode 100644 src/CommentIniSyntaxErrorException.php
 create mode 100644 src/ComponentExpander.php
 delete mode 100644 src/DataKeyMatch.php
 delete mode 100644 src/Document.php
 create mode 100644 src/DocumentBinder.php
 delete mode 100644 src/DocumentFragment.php
 delete mode 100644 src/DocumentType.php
 delete mode 100644 src/Element.php
 create mode 100644 src/ElementBinder.php
 create mode 100644 src/HTMLAttributeBinder.php
 create mode 100644 src/HTMLAttributeCollection.php
 delete mode 100644 src/HTMLCollection.php
 delete mode 100644 src/HTMLDocument.php
 create mode 100644 src/IncorrectTableDataFormat.php
 delete mode 100644 src/InvalidBindProperty.php
 create mode 100644 src/InvalidBindPropertyException.php
 create mode 100644 src/InvalidTemplateElementNameException.php
 create mode 100644 src/ListBinder.php
 create mode 100644 src/ModularContent.php
 create mode 100644 src/ModularContentDirectoryNotFoundException.php
 create mode 100644 src/ModularContentExpander.php
 create mode 100644 src/ModularContentFileNotFoundException.php
 delete mode 100644 src/NamelessTemplateSpecificityException.php
 delete mode 100644 src/Node.php
 delete mode 100644 src/NodeList.php
 create mode 100644 src/NodePathCalculator.php
 delete mode 100644 src/NonDocumentTypeChildNode.php
 delete mode 100644 src/ParentNode.php
 create mode 100644 src/PartialExpander.php
 create mode 100644 src/PlaceholderBinder.php
 create mode 100644 src/PlaceholderText.php
 delete mode 100644 src/StringMap.php
 create mode 100644 src/TableBinder.php
 create mode 100644 src/TableElementNotFoundInContextException.php
 create mode 100644 src/TemplateCollection.php
 delete mode 100644 src/TemplateComponentNotFoundException.php
 create mode 100644 src/TemplateElement.php
 delete mode 100644 src/TemplateElementNotFoundFoundException.php
 create mode 100644 src/TemplateElementNotFoundInContextException.php
 delete mode 100644 src/TemplateHasNoParentException.php
 delete mode 100644 src/TemplateParent.php
 delete mode 100644 src/Text.php
 delete mode 100644 src/TokenList.php
 delete mode 100644 src/UnbindableObjectException.php
 delete mode 100644 test/phpunit/BindDataGetterTest.php
 delete mode 100644 test/phpunit/BindableTest.php
 create mode 100644 test/phpunit/CommentIniTest.php
 create mode 100644 test/phpunit/ComponentExpanderTest.php
 create mode 100644 test/phpunit/DocumentBinderTest.php
 delete mode 100644 test/phpunit/DocumentTest.php
 create mode 100644 test/phpunit/HTMLAttributeBinderTest.php
 delete mode 100644 test/phpunit/HTMLDocumentTest.php
 delete mode 100644 test/phpunit/Helper/BindDataGetter/TodoItem.php
 delete mode 100644 test/phpunit/Helper/Helper.php
 delete mode 100644 test/phpunit/Helper/TodoItemExampleObject.php
 delete mode 100644 test/phpunit/Helper/TodoListExampleObject.php
 create mode 100644 test/phpunit/ListBinderTest.php
 create mode 100644 test/phpunit/ModularContentTest.php
 create mode 100644 test/phpunit/ModularContentTestCase.php
 create mode 100644 test/phpunit/PartialExpanderTest.php
 create mode 100644 test/phpunit/PlaceholderBinderTest.php
 create mode 100644 test/phpunit/TableBinderTest.php
 create mode 100644 test/phpunit/TemplateCollectionTest.php
 create mode 100644 test/phpunit/TemplateElementTest.php
 delete mode 100644 test/phpunit/TemplateParentTest.php
 delete mode 100644 test/phpunit/TestCase.php
 create mode 100644 test/phpunit/TestData.php
 create mode 100644 test/phpunit/TestFactory/DocumentTestFactory.php

diff --git a/README.md b/README.md
index 2afe39d..1def6a2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Bind dynamic data to reusable HTML components.
 
-Built on top of [PHP.Gt/Dom][dom], this project provides simple view templating and dynamic data binding.
+Built on top of [PHP.Gt/Dom][dom], this project provides dynamic data binding to DOM Documents, document templating and reusable HTML components.
 
 Directly manipulating the DOM in your code can lead to tightly coupling the logic and view. Binding data using custom elements and data attributes leads to highly readable, maintainable view files that are loosely coupled to the application logic.  
 
@@ -22,79 +22,51 @@ Directly manipulating the DOM in your code can lead to tightly coupling the logi
 	<img src="https://badge.status.php.gt/domtemplate-docs.svg" alt="PHP.G/DomTemplate documentation" />
 </a>
 
-## Example usage: Bind dynamic data to a template element
+## Example usage: Hello, you!
 
-Consider a page with an unordered list (`<ul>`). Within the list there should be a list item (`<li>`) for every element of an array of data.
+Consider a page with a form, with an input element to enter your name. When the form is submitted, the page should greet you by your name.
 
-In this example, we will simply use an array to contain the data, but the data can come from a data source such as a database, as long as it is `iterable`.
+Without submitting the form, the HTML will be rendered untouched, showing the default message "Hello, you!".
 
-### Source HTML ([`01-groceries-example.html`][example-groceries-html])
+### Source HTML (`name.html`)
 
 ```html
 <!doctype html>
-<h1>Shopping list</h1>
-
-<shopping-list id="groceries"></shopping-list>
-
-<p>The use of a custom element is more useful on more complex pages, but is shown above as an example.</p>
+<h1>
+	Hello, <span class="name-output">you</span>!
+</h1>
+
+<form>
+	<input name="name" placeholder="Your name, please" required />
+	<button>Submit</button>
+</form>
 ```
 
-### Custom element HTML (`_component/shopping-list.html`)
-
-```html
-<ul>
-	<li data-template data-bind:text="title" data-bind:data-id="id">Item name</li>
-</ul>
-```
-
-### PHP used to inject the list
+### PHP used to inject your name (`name.php`)
 
 ```php
 <?php
 require "vendor/autoload.php";
 
-use Gt\DomTemplate\HTMLDocument;
-
-$html = file_get_contents("example.html");
-$document = new HTMLDocument($html, "./_component");
-$document->extractTemplates();
+$html = file_get_contents("name.html");
+/** @var \Gt\Dom\HTMLDocument $document */
+$document = \Gt\Dom\Facade\HTMLDocumentFactory::create($html);
 
-$data = [
-	["id" => 1, "title" => "Tomatoes"],
-	["id" => 2, "title" => "Noodles"],
-	["id" => 3, "title" => "Cheese"],
-	["id" => 4, "title" => "Broccoli"],
-];
+if($name = $_GET["name"]) {
+	$binder = new \Gt\DomTemplate\DocumentBinder($document);
+	$binder->bindKeyValue("name-output", $name);
+}
 
-$outputTo = $document->getElementById("groceries");
-$outputTo->bindList($data);
+echo $document;
 ```
 
-### Output:
-
-```html
-<!doctype html>
-<h1>Shopping list</h1>
-
-<shopping-list>
-    <ul id="shopping-list">
-        <li data-id="1">Tomatoes</li>
-        <li data-id="2">Noodles</li>
-        <li data-id="3">Cheese</li>
-        <li data-id="4">Broccoli</li>
-    </ul>
-</shopping-list>
-
-<p>The use of a custom element is more useful on more complex pages, but is shown above as an example.</p>
-```
 
 Features at a glance
 --------------------
 
-+ HTML components - organise and reuse DOM trees by storing separate components in their own HTML files, and including them using custom HTML tags.
 + Binding of dynamic data - bind key value pairs, associative arrays, lists of associative arrays and even nested lists.
-+ Use standards compliant techniques for templates and components.
-+ Easily style components using CSS by addressing their tag name (`shopping-list` in the above example).
++ HTML components - organise and reuse DOM trees by storing separate components in their own HTML files, and including them using custom HTML tags.
++ Page templates - create HTML documents that "extend" others.
++ Easily modularise CSS by selecting their custom tag names.
 
 [dom]: https://www.php.gt/dom
-[example-groceries-html]: https://github.com/PhpGt/DomTemplate/blob/master/example/01-example-groceries.html
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 7348589..a203538 100644
--- a/composer.json
+++ b/composer.json
@@ -4,8 +4,9 @@
 	"license": "MIT",
 
 	"require": {
+		"php": ">=8.0",
 		"ext-dom": "*",
-		"phpgt/dom": "2.*"
+		"phpgt/dom": "v3.0.0-RC2"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "9.*",
@@ -21,5 +22,12 @@
 		"psr-4": {
 			"Gt\\DomTemplate\\Test\\": "./test/phpunit"
 		}
-	}
+	},
+
+	"funding": [
+		{
+			"type": "github",
+			"url": "https://github.com/sponsors/PhpGt"
+		}
+	]
 }
diff --git a/composer.lock b/composer.lock
index 4e4651d..513a31f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,28 +4,30 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "68ae23e99ffc6599806afc006562ad17",
+    "content-hash": "92f5ba390a50649e9c67eb801c8f1c5a",
     "packages": [
         {
             "name": "phpgt/cssxpath",
-            "version": "v1.1.2",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PhpGt/CssXPath.git",
-                "reference": "cca4df1a33e18aff1bb775372ece5fddb032ba67"
+                "reference": "64813864ab00e52cbde2cd517d6c6235b7f9ac69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PhpGt/CssXPath/zipball/cca4df1a33e18aff1bb775372ece5fddb032ba67",
-                "reference": "cca4df1a33e18aff1bb775372ece5fddb032ba67",
+                "url": "https://api.github.com/repos/PhpGt/CssXPath/zipball/64813864ab00e52cbde2cd517d6c6235b7f9ac69",
+                "reference": "64813864ab00e52cbde2cd517d6c6235b7f9ac69",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2"
+                "php": ">=7.4"
             },
             "require-dev": {
-                "phpgt/dom": "*",
-                "phpunit/phpunit": "^8.0"
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "phpstan/phpstan": ">=0.12.42",
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "autoload": {
@@ -46,31 +48,43 @@
                 }
             ],
             "description": "Convert CSS selectors to XPath queries.",
-            "time": "2019-11-08T13:40:04+00:00"
+            "support": {
+                "issues": "https://github.com/PhpGt/CssXPath/issues",
+                "source": "https://github.com/PhpGt/CssXPath/tree/v1.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/phpgt",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-01-28T13:27:01+00:00"
         },
         {
             "name": "phpgt/dom",
-            "version": "v2.2.1",
+            "version": "v3.0.0-RC2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PhpGt/Dom.git",
-                "reference": "af202e2005fdbb2abc39e9f01defafe799dbc402"
+                "reference": "c68e4085c00e9944e22e64e90ae99a86b097d8f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PhpGt/Dom/zipball/af202e2005fdbb2abc39e9f01defafe799dbc402",
-                "reference": "af202e2005fdbb2abc39e9f01defafe799dbc402",
+                "url": "https://api.github.com/repos/PhpGt/Dom/zipball/c68e4085c00e9944e22e64e90ae99a86b097d8f3",
+                "reference": "c68e4085c00e9944e22e64e90ae99a86b097d8f3",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
-                "php": ">=7.2",
+                "php": ">=8.0",
                 "phpgt/cssxpath": ">=1.1.2",
-                "psr/http-message": "1.*"
+                "phpgt/propfunc": "^1.0",
+                "psr/http-message": "^1.0"
             },
             "require-dev": {
+                "phpstan/phpstan": ">=0.12",
                 "phpunit/phpunit": ">=9.3.8"
             },
             "type": "library",
@@ -127,13 +141,69 @@
                 }
             ],
             "description": "The modern DOM API for PHP projects.",
+            "support": {
+                "issues": "https://github.com/PhpGt/Dom/issues",
+                "source": "https://github.com/PhpGt/Dom/tree/v3.0.0-RC2"
+            },
             "funding": [
                 {
-                    "url": "https://github.com/phpgt",
+                    "url": "https://github.com/sponsors/PhpGt",
                     "type": "github"
                 }
             ],
-            "time": "2020-12-23T12:31:06+00:00"
+            "time": "2021-09-06T17:02:36+00:00"
+        },
+        {
+            "name": "phpgt/propfunc",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PhpGt/PropFunc.git",
+                "reference": "091213649e89ff22d1ef640b46fbee5215c65520"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PhpGt/PropFunc/zipball/091213649e89ff22d1ef640b46fbee5215c65520",
+                "reference": "091213649e89ff22d1ef640b46fbee5215c65520",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": ">=0.12",
+                "phpunit/phpunit": ">=9.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Gt\\PropFunc\\": "./src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Bowler",
+                    "email": "greg.bowler@g105b.com",
+                    "homepage": "https://www.g105b.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Property accessor and mutator functions.",
+            "support": {
+                "issues": "https://github.com/PhpGt/PropFunc/issues",
+                "source": "https://github.com/PhpGt/PropFunc/tree/v1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/PhpGt",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-03-23T12:46:44+00:00"
         },
         {
             "name": "psr/http-message",
@@ -183,6 +253,9 @@
                 "request",
                 "response"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/master"
+            },
             "time": "2016-08-06T14:39:51+00:00"
         }
     ],
@@ -236,6 +309,10 @@
                 "constructor",
                 "instantiate"
             ],
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+            },
             "funding": [
                 {
                     "url": "https://www.doctrine-project.org/sponsorship.html",
@@ -298,6 +375,10 @@
                 "object",
                 "object graph"
             ],
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+            },
             "funding": [
                 {
                     "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
@@ -308,16 +389,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.10.5",
+            "version": "v4.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
-                "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
+                "reference": "6608f01670c3cc5079e18c1dab1104e002579143",
                 "shasum": ""
             },
             "require": {
@@ -356,20 +437,24 @@
                 "parser",
                 "php"
             ],
-            "time": "2021-05-03T19:11:20+00:00"
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
+            },
+            "time": "2021-07-21T10:44:31+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
-                "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                 "shasum": ""
             },
             "require": {
@@ -412,7 +497,11 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2020-06-27T14:33:11+00:00"
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+            },
+            "time": "2021-07-20T11:28:43+00:00"
         },
         {
             "name": "phar-io/version",
@@ -459,6 +548,10 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.1.0"
+            },
             "time": "2021-02-23T14:00:09+00:00"
         },
         {
@@ -508,6 +601,10 @@
                 "reflection",
                 "static analysis"
             ],
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
+            },
             "time": "2020-06-27T09:03:43+00:00"
         },
         {
@@ -560,6 +657,10 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+            },
             "time": "2020-09-03T19:13:55+00:00"
         },
         {
@@ -605,6 +706,10 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "support": {
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+            },
             "time": "2020-09-17T18:55:26+00:00"
         },
         {
@@ -668,20 +773,24 @@
                 "spy",
                 "stub"
             ],
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
+            },
             "time": "2021-03-17T13:42:18+00:00"
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.85",
+            "version": "0.12.98",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "20e6333c0067875ad7697cd8acdf245c6ef69d03"
+                "reference": "3bb7cc246c057405dd5e290c3ecc62ab51d57e00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/20e6333c0067875ad7697cd8acdf245c6ef69d03",
-                "reference": "20e6333c0067875ad7697cd8acdf245c6ef69d03",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3bb7cc246c057405dd5e290c3ecc62ab51d57e00",
+                "reference": "3bb7cc246c057405dd5e290c3ecc62ab51d57e00",
                 "shasum": ""
             },
             "require": {
@@ -710,11 +819,19 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/0.12.98"
+            },
             "funding": [
                 {
                     "url": "https://github.com/ondrejmirtes",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                },
                 {
                     "url": "https://www.patreon.com/phpstan",
                     "type": "patreon"
@@ -724,7 +841,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-27T14:13:16+00:00"
+            "time": "2021-09-02T12:33:01+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -791,6 +908,10 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.6"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -847,6 +968,10 @@
                 "filesystem",
                 "iterator"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -906,6 +1031,10 @@
             "keywords": [
                 "process"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -961,6 +1090,10 @@
             "keywords": [
                 "template"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1016,6 +1149,10 @@
             "keywords": [
                 "timer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1026,16 +1163,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.5",
+            "version": "9.5.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "89ff45ea9d70e35522fb6654a2ebc221158de276"
+                "reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/89ff45ea9d70e35522fb6654a2ebc221158de276",
-                "reference": "89ff45ea9d70e35522fb6654a2ebc221158de276",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b",
+                "reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b",
                 "shasum": ""
             },
             "require": {
@@ -1047,7 +1184,7 @@
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
                 "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.1",
+                "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
                 "phpspec/prophecy": "^1.12.1",
@@ -1065,7 +1202,7 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3.2",
+                "sebastian/type": "^2.3.4",
                 "sebastian/version": "^3.0.2"
             },
             "require-dev": {
@@ -1111,6 +1248,10 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.9"
+            },
             "funding": [
                 {
                     "url": "https://phpunit.de/donate.html",
@@ -1121,7 +1262,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-05T04:49:07+00:00"
+            "time": "2021-08-31T06:47:40+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -1167,6 +1308,10 @@
             ],
             "description": "Library for parsing CLI options",
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1219,6 +1364,10 @@
             ],
             "description": "Collection of value objects that represent the PHP code units",
             "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1270,6 +1419,10 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1340,6 +1493,10 @@
                 "compare",
                 "equality"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1393,6 +1550,10 @@
             ],
             "description": "Library for calculating the complexity of PHP code units",
             "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1455,6 +1616,10 @@
                 "unidiff",
                 "unified diff"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1514,6 +1679,10 @@
                 "environment",
                 "hhvm"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1587,6 +1756,10 @@
                 "export",
                 "exporter"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1597,16 +1770,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.2",
+            "version": "5.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455"
+                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/a90ccbddffa067b51f574dea6eb25d5680839455",
-                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49",
+                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49",
                 "shasum": ""
             },
             "require": {
@@ -1647,13 +1820,17 @@
             "keywords": [
                 "global state"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:55:19+00:00"
+            "time": "2021-06-11T13:31:12+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -1700,6 +1877,10 @@
             ],
             "description": "Library for counting the lines of code in PHP source code",
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1753,6 +1934,10 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1804,6 +1989,10 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1863,6 +2052,10 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1914,26 +2107,31 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "2.3.2",
+            "version": "2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1"
+                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0d1c587401514d17e8f9258a27e23527cb1b06c1",
-                "reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
                 "shasum": ""
             },
             "require": {
@@ -1966,13 +2164,17 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 }
             ],
-            "time": "2021-06-04T13:02:07+00:00"
+            "time": "2021-06-15T12:49:02+00:00"
         },
         {
             "name": "sebastian/version",
@@ -2015,6 +2217,10 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2083,6 +2289,9 @@
                 "polyfill",
                 "portable"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -2101,16 +2310,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                 "shasum": ""
             },
             "require": {
@@ -2137,13 +2346,17 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+            },
             "funding": [
                 {
                     "url": "https://github.com/theseer",
                     "type": "github"
                 }
             ],
-            "time": "2020-07-12T23:59:07+00:00"
+            "time": "2021-07-28T10:34:58+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -2197,17 +2410,24 @@
                 "check",
                 "validate"
             ],
+            "support": {
+                "issues": "https://github.com/webmozarts/assert/issues",
+                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+            },
             "time": "2021-03-09T10:59:23+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "phpgt/dom": 5
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
+        "php": ">=8.0",
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/example/01-example-groceries.html b/example/01-example-groceries.html
deleted file mode 100644
index 3d23e51..0000000
--- a/example/01-example-groceries.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!doctype html>
-<h1>Shopping list</h1>
-
-<shopping-list id="groceries"></shopping-list>
-
-<p>The use of a custom element is more useful on more complex pages, but is shown above as an example.</p>
\ No newline at end of file
diff --git a/example/01-example-groceries.php b/example/01-example-groceries.php
deleted file mode 100644
index 53937d3..0000000
--- a/example/01-example-groceries.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-require __DIR__ . "/../vendor/autoload.php";
-
-use Gt\DomTemplate\HTMLDocument;
-
-$html = file_get_contents("01-example-groceries.html");
-$document = new HTMLDocument($html, "./_component");
-$document->extractTemplates();
-
-$data = [
-	["id" => 1, "title" => "Tomatoes"],
-	["id" => 2, "title" => "Noodles"],
-	["id" => 3, "title" => "Cheese"],
-	["id" => 4, "title" => "Broccoli"],
-];
-
-$outputTo = $document->getElementById("groceries");
-$outputTo->bindList($data);
-
-echo $document;
\ No newline at end of file
diff --git a/example/_component/shopping-list.html b/example/_component/shopping-list.html
deleted file mode 100644
index 7fe10dd..0000000
--- a/example/_component/shopping-list.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<ul>
-	<li data-template data-bind:text="title" data-bind:data-id="id">Item name</li>
-</ul>
\ No newline at end of file
diff --git a/src/Attr.php b/src/Attr.php
deleted file mode 100644
index 9ce752d..0000000
--- a/src/Attr.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use DOMNode;
-use Gt\Dom\Attr as BaseAttr;
-
-/**
- * @property-read Element $ownerElement
- * @property-read Element $parentNode
- * @property-read Node|Element|null $firstChild
- * @property-read Node|Element|null $lastChild
- * @property-read Node|Element|null $previousSibling
- * @property-read Node|Element|null $nextSibling
- * @property-read HTMLDocument $ownerDocument
- *
- * @method Element appendChild(DOMNode $newnode)
- * @method Element cloneNode(bool $deep = false)
- * @method Element insertBefore(DOMNode $newnode, DOMNode $refnode = null)
- * @method Element removeChild(DOMNode $oldnode)
- * @method Element replaceChild(DOMNode $newnode, DOMNode $oldnode)
- */
-class Attr extends BaseAttr {}
\ No newline at end of file
diff --git a/src/Bind.php b/src/Bind.php
new file mode 100644
index 0000000..a422f72
--- /dev/null
+++ b/src/Bind.php
@@ -0,0 +1,12 @@
+<?php /** @noinspection PhpPropertyOnlyWrittenInspection */
+namespace Gt\DomTemplate;
+
+use Attribute;
+
+#[Attribute]
+class Bind {
+	public function __construct(
+		private string $key
+	) {
+	}
+}
diff --git a/src/BindDataMapper.php b/src/BindDataMapper.php
deleted file mode 100644
index f42fddc..0000000
--- a/src/BindDataMapper.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-interface BindDataMapper {
-	/**
-	 * @return array An associative array that describes the key-values
-	 * required to bind to the DomTemplate document.
-	 *
-	 * Example: [
-	 * 	"fullName" => $this->forename . " " . $this->surname,
-	 * 	"age" => date("Y") - $this->dob->format("Y"),
-	 * ]
-	 */
-	public function bindDataMap():array;
-}
\ No newline at end of file
diff --git a/src/BindObject.php b/src/BindObject.php
deleted file mode 100644
index 4a75394..0000000
--- a/src/BindObject.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-/**
- * This interface does not define any functions, but is used to indicate that
- * the implementing class should expose "bind*" functions for the key-value data
- * it represents.
- *
- * For example: class Person implements BindObject {
- * // This function will be called for the "name" key when bound.
- * public function bindName():string {
- * 	return $this->forename . " " . $this->surname;
- * }
- */
-interface BindObject {}
\ No newline at end of file
diff --git a/src/Bindable.php b/src/Bindable.php
deleted file mode 100644
index 2277faa..0000000
--- a/src/Bindable.php
+++ /dev/null
@@ -1,588 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use ArrayObject;
-use Gt\Dom\Attr as BaseAttr;
-use Gt\Dom\Element as BaseElement;
-use Gt\Dom\HTMLCollection as BaseHTMLCollection;
-use Iterator;
-
-/**
- * In WebEngine, all Elements in the DOM are Bindable by default. A Bindable
- * Element is a ParentNode that can have data injected into it via this Trait's
- * bind* functions.
- */
-trait Bindable {
-	/**
-	 * Bind a single key-value-pair within $this Element.
-	 * Elements state their bindable key using the data-bind HTML attribute.
-	 * There may be multiple Elements with the matching attribute, in which
-	 * case they will all have their data set.
-	 */
-	public function bindKeyValue(?string $key, $value):void {
-		if(is_null($value)) {
-			$value = "";
-		}
-
-		if($value === false) {
-			return;
-		}
-		if($value === true) {
-			$value = $key;
-		}
-
-		$this->injectBoundData($key, $value);
-		$this->injectBoundAttribute($key, $value);
-	}
-
-	/**
-	 * Bind a single value to a data-bind element that has no matching
-	 * attribute vale. For example, <p data-bind:text>Your text here</p>
-	 * does not have an addressable attribute value for data-bind:text.
-	 *
-	 * @param mixed $value
-	 */
-	public function bindValue($value):void {
-		$this->bindKeyValue(null, $value);
-// Note, it's impossible to inject attribute placeholders without a key.
-	}
-
-	/**
-	 * Bind multiple key-value-pairs within $this Element, calling
-	 * bindKeyValue for each key-value-pair in the iterable $kvp object.
-	 * @param array|object|BindObject|BindDataMapper $kvp
-	 * @see self::bindKeyValue
-	 */
-	public function bindData($kvp):void {
-		$assocArray = null;
-
-		if($this->isIndexedArray($kvp)) {
-			throw new IncompatibleBindDataException();
-		}
-
-		$assocArray = $this->convertKvpToAssocArray($kvp);
-
-		foreach($assocArray as $key => $value) {
-			$this->bindKeyValue($key, $value);
-		}
-	}
-
-	/**
-	 * $kvpList is a nested iterable object. The outer iterable contains
-	 * zero or more inner iterables. The inner iterables contain data in the
-	 * form of an iterable key-value-pair array (typically an associative
-	 * array or data object).
-	 *
-	 * For each iteration of the outer iterable object, a new clone will be
-	 * made of the template element with the given name. The cloned element
-	 * will have the inner iterable data bound to it before being added into
-	 * the DOM in the position that it was originally extracted.
-	 *
-	 * When $templateName is not provided, the data within $kvpList will be
-	 * bound to an element that has a data-template attribute with no value.
-	 * If there are multiple un-named template elements, an exception is
-	 * thrown - in this case, you will need to use bindNestedList
-	 *
-	 * @throws NamelessTemplateSpecificityException
-	 * @see self::bindNestedList
-	 */
-	public function bindList(
-		?iterable $kvpList,
-		string $templateName = null
-	):int {
-		if(empty($kvpList)) {
-			if($this->children->length === 0) {
-				$this->innerHTML = "";
-			}
-
-			return 0;
-		}
-
-		/** @var BaseElement $element */
-		$element = $this;
-		if($element instanceof HTMLDocument) {
-			$element = $element->documentElement;
-		}
-		/** @var HTMLDocument $document */
-		$document = $element->ownerDocument;
-
-		$fragment = $document->createDocumentFragment();
-
-		if(is_null($templateName)) {
-			$templateElement = $document->getUnnamedTemplate(
-				$element,
-				true,
-				false
-			);
-		}
-		else {
-			$templateElement = $document->getNamedTemplate(
-				$templateName
-			);
-		}
-
-		$templateParent = $templateElement->templateParentNode;
-		$parentPath = $templateParent->getNodePath();
-
-		$count = 0;
-		foreach($kvpList as $key => $data) {
-			$count ++;
-			$t = $templateElement->cloneNode(true);
-			/** @var Element $insertedT */
-			$insertedT = $fragment->appendChild($t);
-
-			if(is_string($key)) {
-				$insertedT->bindValue($key);
-				$insertedT->bindKeyValue("_key", $key);
-			}
-
-			if($this->isBindableValue($data)) {
-				$insertedT->bindValue($data);
-			}
-			else {
-				$insertedT->bindData($data);
-			}
-		}
-
-		$templateParent->appendChild($fragment);
-		return $count;
-	}
-
-	public function bindNestedList(
-		?iterable $nestedKvpList,
-		bool $requireMatchingTemplatePath = false
-	):int {
-		if(empty($nestedKvpList)) {
-			return 0;
-		}
-
-		/** @var BaseElement $element */
-		$element = $this;
-		if($element instanceof HTMLDocument) {
-			$element = $element->documentElement;
-		}
-		/** @var HTMLDocument $document */
-		$document = $element->ownerDocument;
-
-		$templateParent = $document->getParentOfUnnamedTemplate(
-			$element,
-			$requireMatchingTemplatePath
-		);
-
-		$i = 0;
-		foreach($nestedKvpList as $key => $value) {
-			$i++;
-			$t = $document->getUnnamedTemplate(
-				$templateParent,
-				false
-			);
-
-			$insertedTemplate = $templateParent->appendChild($t);
-
-			if(is_string($key)) {
-				$insertedTemplate->bindValue($key);
-			}
-
-			if(is_string($value)) {
-				$insertedTemplate->bindValue($value);
-			}
-			elseif(is_iterable($value)) {
-				$i += $insertedTemplate->bindNestedList(
-					$value,
-					true
-				);
-			}
-			else {
-				$assocArray = $this->convertKvpToAssocArray($value);
-
-				foreach($assocArray as $dataKey => $dataValue) {
-					if($this->isList($dataValue)) {
-						$insertedTemplate->bindNestedList(
-							$dataValue,
-							true
-						);
-					}
-					else {
-						$insertedTemplate->bindKeyValue(
-							$dataKey,
-							$dataValue
-						);
-					}
-				}
-			}
-		}
-
-		return $i;
-	}
-
-	public function bindNames($kvp):void {
-		$nameElements = $this->querySelectorAll("[name]");
-
-		foreach($nameElements as $element) {
-			$name = $element->name;
-			if(!array_key_exists($name, $kvp)) {
-				continue;
-			}
-
-			$element->value = $kvp[$name];
-		}
-	}
-
-	/**
-	 * Within the current element, iterate all children that have a
-	 * matching data-bind:* attribute, and inject the provided $value
-	 * into the according property value.
-	 */
-	protected function injectBoundData(
-		?string $key,
-		$value
-	):void {
-		foreach($this->getChildrenWithBindAttribute() as $child) {
-			foreach($child->attributes as $attr) {
-				/** @var Attr $attr */
-// Skip attributes that do not have a bindProperty set (the text that
-// comes after the colon in data-bind:*
-				$matches = [];
-				if(!preg_match(
-					"/(?:data-bind:)(?P<bindProperty>.+)/",
-					$attr->name,
-					$matches
-				)) {
-					continue;
-				}
-
-				$element = $attr->ownerElement;
-				$keyToSet = $this->getKeyToSet($attr);
-				$attr->ownerDocument->storeBoundAttribute($attr);
-
-// Skip attributes whose value does not equal the key that we are setting.
-				if($keyToSet !== $key) {
-					continue;
-				}
-
-				$bindProperty = $matches["bindProperty"];
-
-				if($bindProperty === "property") {
-					continue;
-				}
-				elseif($bindProperty === "class") {
-					$element->classList->toggle($value);
-				}
-				else {
-					$this->setPropertyValue(
-						$element,
-						$bindProperty,
-						$value,
-						$this->shouldIgnoreFalsey($attr)
-					);
-				}
-			}
-		}
-	}
-
-	/**
-	 * The data-bind syntax can reference another attribute's value to use
-	 * as the key to set, using the @ syntax. For example,
-	 * data-bind:text="@id" will bind the element's text content with the
-	 * data value with the key of the element's id attribute value.
-	 */
-	protected function getKeyToSet(
-		BaseAttr $attr
-	):?string {
-		$keyToSet = $attr->value ?: null;
-
-		if(is_null($keyToSet)) {
-			return null;
-		}
-
-		if($keyToSet[0] === "@") {
-			$lookupAttribute = substr($keyToSet, 1);
-			$keyToSet = $attr->ownerElement->getAttribute(
-				$lookupAttribute
-			);
-
-			if(is_null($keyToSet)) {
-				throw new BoundAttributeDoesNotExistException(
-					$lookupAttribute
-				);
-			}
-		}
-		elseif($keyToSet[0] === "?") {
-			$keyToSet = substr($keyToSet, 1);
-		}
-
-		return $keyToSet;
-	}
-
-	protected function shouldIgnoreFalsey(BaseAttr $attr):bool {
-		if(strlen($attr->value) === 0) {
-			return false;
-		}
-
-		return $attr->value[0] === "?";
-	}
-
-	protected function injectBoundAttribute(
-		?string $key,
-		$value
-	):void {
-		/** @var BaseElement $element */
-		$element = $this;
-		if($element instanceof HTMLDocument) {
-			$element = $element->documentElement;
-		}
-
-		foreach($element->xPath(".//*[@data-bind-attributes]") as $elementToBindAttributes) {
-			foreach($elementToBindAttributes->attributes as $attr) {
-				/** @var Attr $attr */
-
-				$attrValue = $attr->value;
-				if(is_null($key)) {
-					$attrValue = str_replace(
-						"{}",
-						$value,
-						$attrValue
-					);
-
-					$elementToBindAttributes->setAttribute(
-						$attr->name,
-						$attrValue
-					);
-				}
-
-				preg_match_all(
-					"/{(?P<bindProperties>[^}]+)}/",
-					$attr->value,
-					$matches
-				);
-
-				$bindProperties = $matches["bindProperties"] ?? null;
-
-				if(!in_array($key, $bindProperties)) {
-					continue;
-				}
-
-				if(is_null($bindProperties)) {
-					continue;
-				}
-
-				$attrValue = str_replace(
-					"{" . $key . "}",
-					$value,
-					$attrValue
-				);
-
-				$elementToBindAttributes->setAttribute($attr->name, $attrValue);
-			}
-		}
-	}
-
-	protected function setPropertyValue(
-		BaseElement $element,
-		string $bindProperty,
-		string $value,
-		bool $ignoreFalsey = false
-	):void {
-		if($ignoreFalsey) {
-			if(!$value) {
-				return;
-			}
-		}
-
-		switch($bindProperty) {
-		case "html":
-		case "innerhtml":
-		case "innerHtml":
-		case "innerHTML":
-			$element->innerHTML = $value;
-			break;
-
-		case "text":
-		case "innertext":
-		case "innerText":
-			$element->innerText = $value;
-			break;
-
-		case "value":
-			$tagName = strtoupper($element->tagName);
-			switch($tagName) {
-			case "SELECT":
-			case "INPUT":
-			case "TEXTAREA":
-				$element->value = $value;
-				break;
-			default:
-				$element->setAttribute($bindProperty, $value);
-			}
-			break;
-
-		default:
-			$element->setAttribute($bindProperty, $value);
-		}
-	}
-
-	protected function getChildrenWithBindAttribute():BaseHTMLCollection {
-		/** @var BaseElement $element */
-		$element = $this;
-		if($element instanceof HTMLDocument) {
-			$element = $element->documentElement;
-		}
-
-		return $element->xPath(
-			"descendant-or-self::*[@*[starts-with(name(), 'data-bind')]]"
-		);
-	}
-
-	protected function isIndexedArray($array):bool {
-		if(!is_array($array)) {
-			return false;
-		}
-
-		if($array == []) {
-			return false;
-		}
-
-		$keys = array_keys($array);
-		$isIndexed = true;
-
-		foreach($keys as $key) {
-			if(!is_int($key)) {
-				$isIndexed = false;
-			}
-		}
-
-		return $isIndexed;
-	}
-
-	protected function isAssociativeArray($array):bool {
-		if(!is_array($array)) {
-			return false;
-		}
-
-		if($array == []) {
-			return true;
-		}
-
-		$keys = array_keys($array);
-		$isAssociative = true;
-
-		foreach($keys as $key) {
-			if(!is_string($key)) {
-				$isAssociative = false;
-			}
-		}
-
-		return $isAssociative;
-	}
-
-	/**
-	 * Does DomTemplate consider $data to be a data structure that
-	 * represents a single BindableValue? A BindableValue is a single datum
-	 * that does not have a "key-value" structure (just a "value").
-	 */
-	protected function isBindableValue($data):bool {
-		return is_string($data)
-		|| is_numeric($data)
-		|| (is_object($data) && method_exists($data, "__toString"));
-	}
-
-	/**
-	 * Does DomTemplate consider $data to be a BindableData structure that
-	 * represents a "key-value" structure?
-	 */
-	protected function isBindableData($data):bool {
-		if(is_null($data)) {
-			return false;
-		}
-
-		if([] == $data) {
-			return true;
-		}
-
-		if($data instanceof BindObject
-		|| $data instanceof BindDataMapper) {
-			return true;
-		}
-
-		if(is_object($data) && !is_iterable($data)) {
-			return true;
-		}
-
-		if(is_array($data)) {
-			$key = key($data);
-			$firstItem = $data[$key];
-
-			if($this->isBindableValue($firstItem)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Does DomTemplate consider $data to be a List that represents multiple
-	 * BindableData? A List is an iterable data structure that contains
-	 * zero or more "key-value" structure.
-	 */
-	protected function isList($data):bool {
-		$firstItem = null;
-
-		if(is_array($data)) {
-			$key = key($data);
-			$firstItem = $data[$key];
-		}
-		elseif($data instanceof Iterator) {
-			$firstItem = $data->current();
-		}
-
-		if(is_null($firstItem)) {
-			return false;
-		}
-
-		return $this->isBindableData($firstItem)
-			|| $this->isBindableValue($firstItem);
-	}
-
-	protected function convertKvpToAssocArray($kvp):array {
-		if($this->isAssociativeArray($kvp)) {
-			$assocArray = $kvp;
-		}
-		else {
-			if($kvp instanceof BindDataMapper) {
-				$assocArray = $kvp->bindDataMap();
-			}
-			elseif($kvp instanceof BindObject) {
-				$assocArray = [];
-				$prefix = "bind";
-				foreach(get_class_methods($kvp) as $method) {
-					if(strpos($method, $prefix) !== 0) {
-						continue;
-					}
-
-					$key = lcfirst(
-						substr(
-							$method,
-							strlen($prefix)
-						)
-					);
-
-					$value = $kvp->$method();
-					$assocArray[$key] = $value;
-				}
-			}
-			elseif($kvp instanceof ArrayObject) {
-				$assocArray = (array)$kvp;
-			}
-			elseif(is_object($kvp)) {
-// Finally, assume the kvp is a Plain Old PHP Object (POPO).
-				$assocArray = get_object_vars($kvp);
-			}
-			else {
-				$assocArray = $kvp;
-			}
-		}
-
-		return $assocArray;
-	}
-}
diff --git a/src/BoundAttributeDoesNotExistException.php b/src/BoundAttributeDoesNotExistException.php
deleted file mode 100644
index 2e817d1..0000000
--- a/src/BoundAttributeDoesNotExistException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-class BoundAttributeDoesNotExistException extends DomTemplateException {}
\ No newline at end of file
diff --git a/src/BoundDataNotSetException.php b/src/BoundDataNotSetException.php
deleted file mode 100644
index 305b9d7..0000000
--- a/src/BoundDataNotSetException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-class BoundDataNotSetException extends DomTemplateException {}
\ No newline at end of file
diff --git a/src/CharacterData.php b/src/CharacterData.php
deleted file mode 100644
index 6fca71c..0000000
--- a/src/CharacterData.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use Gt\Dom\CharacterData as BaseCharacterData;
-
-class CharacterData extends BaseCharacterData {
-	use NonDocumentTypeChildNode, ChildNode;
-}
\ No newline at end of file
diff --git a/src/ChildNode.php b/src/ChildNode.php
deleted file mode 100644
index 9a7a511..0000000
--- a/src/ChildNode.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-/**
- * @property-read Node|Element $parentNode
- */
-trait ChildNode {}
\ No newline at end of file
diff --git a/src/Comment.php b/src/Comment.php
deleted file mode 100644
index dddf7f0..0000000
--- a/src/Comment.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use Gt\Dom\Comment as BaseComment;
-
-class Comment extends BaseComment {}
\ No newline at end of file
diff --git a/src/CommentIni.php b/src/CommentIni.php
new file mode 100644
index 0000000..cdc9ed2
--- /dev/null
+++ b/src/CommentIni.php
@@ -0,0 +1,75 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Comment;
+use Gt\Dom\Document;
+use Gt\Dom\Element;
+use Gt\Dom\NodeFilter;
+use Throwable;
+
+class CommentIni {
+	/** @var array<string, array<string, string>|string>|null */
+	private ?array $iniData;
+
+	public function __construct(
+		Document|Element $context
+	) {
+		if($context instanceof Element) {
+			$context = $context->ownerDocument;
+		}
+		/** @var Document $context */
+
+		$walker = $context->createTreeWalker(
+			$context,
+			NodeFilter::SHOW_COMMENT
+		);
+
+		$ini = null;
+		$commentNodeToRemove = null;
+
+		while($commentNode = $walker->nextNode()) {
+			/** @var Comment $commentNode */
+			$data = trim($commentNode->data);
+
+			try {
+				$ini = parse_ini_string($data, true);
+				$commentNodeToRemove = $commentNode;
+			}
+			catch(Throwable) {
+				$ini = null;
+			}
+			if(!$ini) {
+				break;
+			}
+
+// At this point, the ini has successfully parsed.
+			$context = $commentNode;
+			while($context = $context->previousSibling) {
+				if(trim($context->textContent) !== "") {
+					throw new CommentIniInvalidDocumentLocationException("A Comment INI must only appear as the first node of the HTML.");
+				}
+			}
+		}
+
+		if($commentNodeToRemove) {
+			$commentNodeToRemove->parentNode->removeChild($commentNodeToRemove);
+		}
+
+		$this->iniData = $ini;
+	}
+
+	public function get(string $variable):?string {
+		$parts = explode(".", $variable);
+
+		$var = $this->iniData;
+		foreach($parts as $part) {
+			$var = $var[$part] ?? null;
+		}
+
+		return $var;
+	}
+
+	public function containsIniData():bool {
+		return !empty($this->iniData);
+	}
+}
diff --git a/src/CommentIniInvalidDocumentLocationException.php b/src/CommentIniInvalidDocumentLocationException.php
new file mode 100644
index 0000000..9969242
--- /dev/null
+++ b/src/CommentIniInvalidDocumentLocationException.php
@@ -0,0 +1,4 @@
+<?php
+namespace Gt\DomTemplate;
+
+class CommentIniInvalidDocumentLocationException extends DomTemplateException {}
diff --git a/src/CommentIniSyntaxErrorException.php b/src/CommentIniSyntaxErrorException.php
new file mode 100644
index 0000000..7fcc955
--- /dev/null
+++ b/src/CommentIniSyntaxErrorException.php
@@ -0,0 +1,4 @@
+<?php
+namespace Gt\DomTemplate;
+
+class CommentIniSyntaxErrorException extends DomTemplateException {}
diff --git a/src/ComponentExpander.php b/src/ComponentExpander.php
new file mode 100644
index 0000000..cb0d9fd
--- /dev/null
+++ b/src/ComponentExpander.php
@@ -0,0 +1,43 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Document;
+use Gt\Dom\Element;
+use Throwable;
+
+class ComponentExpander extends ModularContentExpander {
+	/** @return Element[] */
+	public function expand(Element $context = null):array {
+		$expandedComponentArray = [];
+
+		if(is_null($context)) {
+			$context = $this->document->documentElement;
+		}
+
+// Any HTML element is considered a "custom element" if it contains a hyphen in
+// its name:
+// @see https://www.w3.org/TR/custom-elements/#valid-custom-element-name
+		$xpathResult = $this->document->evaluate(
+			".//*[contains(local-name(), '-')]",
+			$context
+		);
+		foreach($xpathResult as $element) {
+			/** @var Element $element */
+			$name = strtolower($element->tagName);
+
+			try {
+				$content = $this->modularContent->getContent($name);
+				$element->innerHTML = $content;
+				array_push($expandedComponentArray, $element);
+				$recursiveExpandedComponents = $this->expand($element);
+				$expandedComponentArray = array_merge(
+					$expandedComponentArray,
+					$recursiveExpandedComponents
+				);
+			}
+			catch(Throwable) {}
+		}
+
+		return $expandedComponentArray;
+	}
+}
diff --git a/src/DataKeyMatch.php b/src/DataKeyMatch.php
deleted file mode 100644
index 7e65cad..0000000
--- a/src/DataKeyMatch.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use DateTimeInterface;
-
-class DataKeyMatch {
-	protected $key;
-	protected $required;
-
-	public function __construct(string $key, bool $required) {
-		$this->key = $key;
-		$this->required = $required;
-	}
-
-	public function checkDataExists($data) {
-		if(!$this->required) {
-			return;
-		}
-
-		if(method_exists($data, "contains")) {
-			if($data->contains($this->key)) {
-				return;
-			}
-		}
-
-		$value = $data->{$this->key} ?? null;
-
-		if(is_null($value)) {
-			throw new BoundDataNotSetException($this->key);
-		}
-	}
-
-	public function getValue($data):?string {
-		$this->checkDataExists($data);
-
-		if(method_exists($data, "get")) {
-			$value = $data->get($this->key);
-		}
-		else {
-			$value = $data->{$this->key} ?? null;
-		}
-
-		if($value instanceof DateTimeInterface) {
-			$value = $value->format("Y-m-d H:i:s");
-		}
-
-		return $value;
-	}
-}
\ No newline at end of file
diff --git a/src/Document.php b/src/Document.php
deleted file mode 100644
index 8b0a01e..0000000
--- a/src/Document.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use DOMAttr;
-use DOMCharacterData;
-use DOMComment;
-use DOMDocument;
-use DOMDocumentType;
-use DOMElement;
-use DOMNode;
-use DOMDocumentFragment;
-use DOMText;
-use Gt\Dom\Document as BaseDocument;
-
-/**
- * @property-read DocumentType $doctype;
- * @property-read Element $documentElement
- * @property-read Document $ownerDocument
- *
- * @method Attr createAttribute(string $name)
- * @method Comment createComment(string $data)
- * @method DocumentFragment createDocumentFragment()
- * @method Element createElement(string $name)
- * @method Element createTextNode(string $content)
- * @method ?Element getElementById(string $id)
- */
-class Document extends BaseDocument {
-	use ParentNode;
-
-	public function __construct($document = null) {
-		parent::__construct($document);
-
-		$this->registerNodeClass(DOMNode::class, Node::class);
-		$this->registerNodeClass(DOMElement::class, Element::class);
-		$this->registerNodeClass(DOMAttr::class, Attr::class);
-		$this->registerNodeClass(DOMDocumentFragment::class, DocumentFragment::class);
-		$this->registerNodeClass(DOMDocumentType::class, DocumentType::class);
-		$this->registerNodeClass(DOMCharacterData::class, CharacterData::class);
-		$this->registerNodeClass(DOMText::class, Text::class);
-		$this->registerNodeClass(DOMComment::class, Comment::class);
-	}
-}
\ No newline at end of file
diff --git a/src/DocumentBinder.php b/src/DocumentBinder.php
new file mode 100644
index 0000000..882d99e
--- /dev/null
+++ b/src/DocumentBinder.php
@@ -0,0 +1,122 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Document;
+use Gt\Dom\Element;
+use Iterator;
+
+class DocumentBinder {
+	private ElementBinder $elementBinder;
+	private PlaceholderBinder $placeholderBinder;
+	private TableBinder $tableBinder;
+	private ListBinder $listBinder;
+	private TemplateCollection $templateCollection;
+
+	/**
+	 * @param array<string, string> $config
+	 */
+	public function __construct(
+		private Document $document,
+		private array $config = [],
+		?ElementBinder $elementBinder = null,
+		?PlaceholderBinder $placeholderBinder = null,
+		?TableBinder $tableBinder = null,
+		?ListBinder $listBinder = null,
+		?TemplateCollection $templateCollection = null,
+	) {
+		$this->templateCollection = $templateCollection ?? new TemplateCollection($document);
+		$this->elementBinder = $elementBinder ?? new ElementBinder();
+		$this->placeholderBinder = $placeholderBinder ?? new PlaceholderBinder();
+		$this->tableBinder = $tableBinder ?? new TableBinder();
+		$this->listBinder = $listBinder ?? new ListBinder($this->templateCollection);
+	}
+
+	/**
+	 * Applies the string value of $value anywhere within $context that
+	 * has a data-bind attribute with no specified key.
+	 */
+	public function bindValue(
+		mixed $value,
+		?Element $context = null
+	):void {
+		$this->bind(null, $value, $context);
+	}
+
+	/**
+	 * Applies the string value of $value to any elements within $context
+	 * that have the data-bind attribute matching the provided key.
+	 */
+	public function bindKeyValue(
+		string $key,
+		mixed $value,
+		?Element $context = null
+	):void {
+		$this->bind($key, $value, $context);
+	}
+
+	/**
+	 * Binds multiple key-value-pairs to any matching elements within
+	 * the $context element.
+	 */
+	public function bindData(
+		mixed $kvp,
+		?Element $context = null
+	):void {
+		if($this->isIndexedArray($kvp)) {
+			throw new IncompatibleBindDataException("bindData is only compatible with key-value-pair data, but it was passed an indexed array.");
+		}
+
+		foreach($kvp as $key => $value) {
+			$this->bindKeyValue($key, $value, $context);
+		}
+	}
+
+	public function bindTable(
+		mixed $tableData,
+		?Element $context = null
+	):void {
+		$this->tableBinder->bindTableData($tableData, $context);
+	}
+
+	/**
+	 * @param Iterator<mixed> $listData
+	 */
+	public function bindList(
+		iterable $listData,
+		?Element $context = null,
+		?string $templateName = null
+	):int {
+		if(!$context) {
+			$context = $this->document;
+		}
+
+		return $this->listBinder->bindListData($listData, $context, $templateName);
+	}
+
+	private function bind(
+		?string $key,
+		mixed $value,
+		?Element $context = null
+	):void {
+		if(!$context) {
+			$context = $this->document->documentElement;
+		}
+
+		$this->elementBinder->bind($key, $value, $context);
+		$this->placeholderBinder->bind($key, $value, $context);
+	}
+
+	private function isIndexedArray(mixed $data):bool {
+		if(!is_array($data)) {
+			return false;
+		}
+
+		foreach(array_keys($data) as $key) {
+			if(!is_int($key)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/src/DocumentFragment.php b/src/DocumentFragment.php
deleted file mode 100644
index 896f38f..0000000
--- a/src/DocumentFragment.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use DOMNode;
-use Gt\Dom\Node as BaseNode;
-use Gt\Dom\DocumentFragment as BaseDocumentFragment;
-
-/**
- * @method Node cloneNode(bool $deep)
- */
-class DocumentFragment extends BaseDocumentFragment {
-	use ParentNode, TemplateParent, Bindable;
-
-	/** @var Element */
-	public $templateParentNode;
-	/** @var Element */
-	public $templateNextElementSibling;
-	/** @var Element */
-	public $templatePreviousElementSibling;
-
-	/**
-	 * @param BaseNode $parentNode
-	 * @param BaseNode $nextElementSibling
-	 * @param BaseNode $previousElementSibling
-	 */
-	public function setTemplateProperties(
-		$parentNode = null,
-		$nextElementSibling = null,
-		$previousElementSibling = null
-	):void {
-		$this->templateParentNode = $parentNode;
-		$this->templateNextElementSibling = $nextElementSibling;
-		$this->templatePreviousElementSibling = $previousElementSibling;
-	}
-
-	/**
-	 * @return Node|Element
-	 */
-	public function insertTemplate(DOMNode $insertInto = null) {
-		$insertBefore = null;
-
-		if(is_null($insertInto)) {
-			$insertInto = $this->templateParentNode;
-			$insertBefore = $this->templateNextElementSibling;
-		}
-		if(is_null($insertInto)) {
-			throw new TemplateHasNoParentException();
-		}
-
-		$clone = $this->cloneNode(true);
-
-		/** @var Element $inserted */
-		$inserted = $insertInto->insertBefore(
-			$clone,
-			$insertBefore
-		);
-
-		return $inserted;
-	}
-}
diff --git a/src/DocumentType.php b/src/DocumentType.php
deleted file mode 100644
index 8b0c77f..0000000
--- a/src/DocumentType.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use Gt\Dom\DocumentType as BaseDocumentType;
-
-class DocumentType extends BaseDocumentType {
-	use ChildNode;
-}
\ No newline at end of file
diff --git a/src/DomTemplateException.php b/src/DomTemplateException.php
index c850058..00b7266 100644
--- a/src/DomTemplateException.php
+++ b/src/DomTemplateException.php
@@ -1,7 +1,7 @@
 <?php
-
 namespace Gt\DomTemplate;
 
 use RuntimeException;
 
-class DomTemplateException extends RuntimeException {}
\ No newline at end of file
+class DomTemplateException extends RuntimeException {
+}
diff --git a/src/Element.php b/src/Element.php
deleted file mode 100644
index 98f958a..0000000
--- a/src/Element.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use DOMAttr;
-use DOMNode;
-use Gt\Dom\Element as BaseElement;
-use Gt\Dom\PropertyAttribute;
-
-/**
- * @property-read Attr[] $attributes
- * @property string $className Gets and sets the value of the class attribute
- * @property-read TokenList $classList Returns a live TokenList collection of
- * the class attributes of the element
- * @property bool $checked Indicates whether the element is checked or not
- * @property bool $selected Indicates whether the element is selected or not
- * @property string $value Gets or sets the value of the element according to
- * its element type
- * @property string $id Gets or sets the value of the id attribute
- * @property string $innerHTML Gets or sets the HTML syntax describing the
- * element's descendants
- * @property string $outerHTML Gets or sets the HTML syntax describing the
- * element and its descendants. It can be set to replace the element with nodes
- * parsed from the given string
- * @property string $innerText
- * @property-read StringMap $dataset
- *
- * @method Attr setAttribute(string $name, string $value)
- * @method Attr setAttributeNode(DOMAttr $attr)
- * @method Attr getAttributeNode(string $name)
- *
- * Inherited from Node:
- *
- * @method Node|Element appendChild(DOMNode $newnode)
- * @method Node|Element cloneNode(bool $deep = false)
- * @method Node|Element insertBefore(DOMNode $newnode, DOMNode $refnode = null)
- * @method Node|Element removeChild(DOMNode $oldnode)
- * @method Node|Element replaceChild(DOMNode $newnode, DOMNode $oldnode)
- *
- * @property-read ?Node $parentNode
- * @property-read ?Node $firstChild
- * @property-read ?Node $lastChild
- * @property-read ?Node $previousSibling
- * @property-read ?Node $nextSibling
- */
-class Element extends BaseElement {
-	use NonDocumentTypeChildNode, ChildNode, ParentNode,
-		TemplateParent, Bindable;
-}
\ No newline at end of file
diff --git a/src/ElementBinder.php b/src/ElementBinder.php
new file mode 100644
index 0000000..e432aee
--- /dev/null
+++ b/src/ElementBinder.php
@@ -0,0 +1,108 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\DOMTokenList;
+use Gt\Dom\Element;
+use Gt\Dom\Facade\DOMTokenListFactory;
+use Gt\Dom\Node;
+use Gt\Dom\XPathResult;
+use ReflectionClass;
+use ReflectionMethod;
+use ReflectionProperty;
+
+class ElementBinder {
+	private HTMLAttributeBinder $htmlAttributeBinder;
+	private HTMLAttributeCollection $htmlAttributeCollection;
+	private PlaceholderBinder $placeholderBinder;
+
+	public function __construct(
+		?HTMLAttributeBinder $htmlAttributeBinder = null,
+		?HTMLAttributeCollection $htmlAttributeCollection = null,
+		?PlaceholderBinder $placeholderBinder = null,
+	) {
+		$this->htmlAttributeBinder = $htmlAttributeBinder ?? new HTMLAttributeBinder();
+		$this->htmlAttributeCollection = $htmlAttributeCollection ?? new HTMLAttributeCollection();
+		$this->placeholderBinder = $placeholderBinder ?? new PlaceholderBinder();
+	}
+
+	/**
+	 * Binds an Element and its children according to any HTML "data-bind"
+	 * attributes found, and any {{placeholder}} text.
+	 */
+	public function bind(
+		?string $key,
+		mixed $value,
+		Element $context
+	):void {
+		foreach($this->htmlAttributeCollection->find($context) as $element) {
+			/** @var Element $element */
+			$this->htmlAttributeBinder->expandAttributes($element);
+			$this->htmlAttributeBinder->bind($key, $value, $element);
+		}
+
+		$this->placeholderBinder->bind($key, $value, $context);
+	}
+
+	/**
+	 * A "bindable" object is any object with the Gt\DomTemplate\Bind
+	 * Attribute applied to any of its public properties or methods.
+	 * The Attribute's first parameter is required, which sets the property
+	 * or method's bind key. For example, a method called "getTotalMessages"
+	 * could be marked with the #[Bind("message-count")] Attribute, so the
+	 * method will be called whenever the "message-count" bind key is used
+	 * in the document.
+	 */
+	public function bindMethodPropertyAttributes(
+		object $objectWithAttributes,
+		Element $context
+	):void {
+		$bindKeyList = [];
+		foreach($this->htmlAttributeCollection->find($context) as $bindElement) {
+			/** @var Element $bindElement */
+			array_push($bindKeyList, ...$this->getBindKeys($bindElement));
+		}
+
+		$refClass = new ReflectionClass($objectWithAttributes);
+		foreach($refClass->getMethods(ReflectionMethod::IS_PUBLIC) as $refMethod) {
+			foreach($refMethod->getAttributes(Bind::class) as $refAttribute) {
+				$args = $refAttribute->getArguments();
+				$bindKey = $args[0];
+				if(!in_array($bindKey, $bindKeyList)) {
+					continue;
+				}
+
+				$this->bind(
+					$bindKey,
+					call_user_func([$objectWithAttributes, $refMethod->getName()]),
+					$context
+				);
+			}
+		}
+
+		foreach($refClass->getProperties(ReflectionProperty::IS_PUBLIC) as $refProperty) {
+			foreach($refProperty->getAttributes(Bind::class) as $refAttribute) {
+				$args = $refAttribute->getArguments();
+				$bindKey = $args[0];
+				if(!in_array($bindKey, $bindKeyList)) {
+					continue;
+				}
+
+				$this->bind(
+					$bindKey,
+					$objectWithAttributes->{$refProperty->getName()},
+					$context
+				);
+			}
+		}
+	}
+
+	/** @return array<int, string> */
+	private function getBindKeys(Element $element):array {
+		$bindKeyList = [];
+		foreach($element->attributes as $attributeValue) {
+			array_push($bindKeyList, $attributeValue);
+		}
+
+		return $bindKeyList;
+	}
+}
diff --git a/src/HTMLAttributeBinder.php b/src/HTMLAttributeBinder.php
new file mode 100644
index 0000000..9de4866
--- /dev/null
+++ b/src/HTMLAttributeBinder.php
@@ -0,0 +1,233 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Document;
+use Gt\Dom\DOMTokenList;
+use Gt\Dom\Element;
+use Gt\Dom\Facade\DOMTokenListFactory;
+
+class HTMLAttributeBinder {
+	private TableBinder $tableBinder;
+
+	public function bind(
+		?string $key,
+		mixed $value,
+		Document|Element $element
+	):void {
+		if($element instanceof Document) {
+			$element = $element->documentElement;
+		}
+
+		foreach($element->attributes as $attrName => $attrValue) {
+			if(!str_starts_with($attrName, "data-bind")) {
+				continue;
+			}
+
+			if(!strstr($attrName, ":")) {
+				$tag = $this->getHTMLTag($element);
+				throw new InvalidBindPropertyException("$tag Element has a data-bind attribute with missing bind property - did you mean `data-bind:text`?");
+			}
+
+			$modifier = null;
+			if(is_null($key)) {
+// If there is no key specified, only bind the elements that don't have a
+// specified key in their bind attribute's value.
+				if(strlen($attrValue) > 0) {
+					continue;
+				}
+			}
+			else {
+// If there is a key specified, and the bind attribute's value doesn't match,
+// skip this attribute.
+				$trimmedAttrValue = ltrim($attrValue, ":!?");
+				$trimmedAttrValue = strtok($trimmedAttrValue, " ");
+				if($key !== $trimmedAttrValue) {
+					continue;
+				}
+				if($attrValue !== $trimmedAttrValue) {
+					$modifier = $attrValue;
+				}
+			}
+
+			$this->setBindProperty(
+				$element,
+				substr(
+					$attrName,
+					strpos($attrName, ":") + 1
+				),
+				$value,
+				$modifier
+			);
+		}
+	}
+
+	public function expandAttributes(Element $element):void {
+		foreach($element->attributes as $attrName => $attrValue) {
+			if(!str_starts_with($attrName, "data-bind:")) {
+				continue;
+			}
+
+			if(strlen($attrValue) === 0) {
+				continue;
+			}
+
+			if($attrValue[0] === "@") {
+				$otherAttrName = substr($attrValue, 1);
+				$element->setAttribute(
+					$attrName,
+					$element->getAttribute($otherAttrName)
+				);
+			}
+		}
+	}
+
+	private function getHTMLTag(Element $element):string {
+		return "<" . strtolower($element->tagName) . ">";
+	}
+
+	/**
+	 * This function actually mutates the Element. The type of mutation is
+	 * defined by the value of $bindProperty. The default behaviour is to
+	 * set the an attribute on $element where the attribute key is equal to
+	 * $bindProperty and the attribute value is equal to $bindValue, however
+	 * there are a few values of $bindProperty that affect this behaviour:
+	 *
+	 * 1) "text" will set the textContent of $element. Why "text" and
+	 * not "textContent"? Because HTML attributes can't have uppercase
+	 * characters, and this removes ambiguity.
+	 * 2) "html" will set the innerHTML of $element. Same as above.
+	 * 3) "class" will add the provided value as a class (rather than
+	 * setting the class attribute and losing existing classes). The colon
+	 * can be added to the bindKey to toggle, as explained in point 6 below.
+	 * 4) "table" will create the appropriate columns and rows within the
+	 * first <table> element within the element being bound.
+	 * 5) "attr" will bind the attribute with the same name as the bindKey.
+	 * 6) By default, the attribute matching $bindProperty will be set,
+	 * according to these rules:
+	 *    + If the bindKey is an alphanumeric string, the attribute will be
+	 * 	set to the value of the matching bindValue.
+	 *    + If the bindKey starts with a colon character ":", the attribute
+	 * 	will be treated as a Token List, and the matching token will be
+	 * 	added/removed from the attribute value depending on whether the
+	 * 	$bindValue is true/false.
+	 *    + If the bindKey starts with a question mark "?", the attribute
+	 * 	will be toggled, depending on whether the $bindValue is
+	 * 	true/false.
+	 *    + If the bindKey starts with a question mark and exclamation mark,
+	 * 	"?!", the attribute will be toggled as above, but with inverse
+	 * 	logic. Useful for toggling "disabled" attribute from data that
+	 * 	represents "enabled" state.
+	 *
+	 * With colon/question mark bind values, the value of the attribute will
+	 * match the value of $bindValue - if a different attribute value is
+	 * required, this can be specified after a space. For example:
+	 * data-bind:class=":isSelected selected-item" will add/remove the
+	 * "selected-item" class depending on the $bindValue's boolean value.
+	 * @noinspection SpellCheckingInspection
+	 */
+	private function setBindProperty(
+		Element $element,
+		string $bindProperty,
+		mixed $bindValue,
+		?string $modifier = null
+	):void {
+		switch(strtolower($bindProperty)) {
+		case "text":
+		case "innertext":
+		case "inner-text":
+		case "textcontent":
+		case "text-content":
+			$element->textContent = $bindValue;
+			break;
+
+		case "html":
+		case "innerhtml":
+		case "inner-html":
+			$element->innerHTML = $bindValue;
+			break;
+
+		case "class":
+			if($modifier) {
+				$this->handleModifier(
+					$element,
+					"class",
+					$modifier,
+					$bindValue
+				);
+			}
+			else {
+				$element->classList->add($bindValue);
+			}
+			break;
+
+		case "table":
+			if(!isset($this->tableBinder)) {
+				$this->tableBinder = new TableBinder();
+			}
+			$this->tableBinder->bindTableData($bindValue, $element);
+			break;
+
+		default:
+			if($modifier) {
+				$this->handleModifier(
+					$element,
+					$bindProperty,
+					$modifier,
+					$bindValue
+				);
+			}
+			else {
+				$element->setAttribute($bindProperty, $bindValue);
+			}
+
+			break;
+		}
+	}
+
+	private function handleModifier(
+		Element $element,
+		string $attribute,
+		string $modifier,
+		mixed $bindValue
+	):void {
+		$modifierChar = $modifier[0];
+		$modifierValue = substr($modifier, 1);
+		if(false !== $spacePos = strpos($modifierValue, " ")) {
+			$modifierValue = substr($modifierValue, $spacePos + 1);
+		}
+
+		switch($modifierChar) {
+		case ":":
+			$tokenList = $this->getTokenList($element, $attribute);
+			if($bindValue) {
+				$tokenList->add($modifierValue);
+			}
+			else {
+				$tokenList->remove($modifierValue);
+			}
+			break;
+
+		case "?":
+			if($modifierValue[0] === "!") {
+				$bindValue = !$bindValue;
+			}
+
+			if($bindValue) {
+				$element->setAttribute($attribute, "");
+			}
+			else {
+				$element->removeAttribute($attribute);
+			}
+		}
+	}
+
+	private function getTokenList(
+		Element $node,
+		string $attribute
+	):DOMTokenList {
+		return DOMTokenListFactory::create(
+			fn() => explode(" ", $node->getAttribute($attribute)),
+			fn(string...$tokens) => $node->setAttribute($attribute, implode(" ", $tokens)),
+		);
+	}
+}
diff --git a/src/HTMLAttributeCollection.php b/src/HTMLAttributeCollection.php
new file mode 100644
index 0000000..c3dc3df
--- /dev/null
+++ b/src/HTMLAttributeCollection.php
@@ -0,0 +1,14 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Element;
+use Gt\Dom\XPathResult;
+
+class HTMLAttributeCollection {
+	public function find(Element $context):XPathResult {
+		return $context->ownerDocument->evaluate(
+			"descendant-or-self::*[@*[starts-with(name(), 'data-bind')]]",
+			$context
+		);
+	}
+}
diff --git a/src/HTMLCollection.php b/src/HTMLCollection.php
deleted file mode 100644
index d005eff..0000000
--- a/src/HTMLCollection.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use Gt\Dom\HTMLCollection as BaseHTMLCollection;
-
-/**
- * @method offsetGet($offset) : ?Element
- * @method current() : ?Element
- */
-class HTMLCollection extends BaseHTMLCollection {}
\ No newline at end of file
diff --git a/src/HTMLDocument.php b/src/HTMLDocument.php
deleted file mode 100644
index 1aaf429..0000000
--- a/src/HTMLDocument.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use DOMDocument;
-use DOMElement;
-use DOMDocumentFragment;
-use Gt\Dom\HTMLDocument as BaseHTMLDocument;
-use Gt\Dom\DocumentFragment as BaseDocumentFragment;
-use Gt\Dom\Attr as BaseAttr;
-use Gt\Dom\HTMLCollection as BaseHTMLCollection;
-
-/**
- * @property-read Element $head
- * @property-read Element $documentElement;
- * @property-read Node $firstChild;
- * @property-read Node $lastChild;
- * @property-read Element $firstElementChild;
- * @property-read Element $lastElementChild;
- * @property-read Element $body;
- * @property-read HTMLCollection|Element[] $forms;
- *
- * @method Attr createAttribute(string $name)
- * @method Comment createComment(string $data)
- * @method DocumentFragment createDocumentFragment()
- * @method Element createElement(string $name)
- * @method Element createTextNode(string $content)
- * @method ?Element getElementById(string $id)
- *
- */
-class HTMLDocument extends BaseHTMLDocument {
-	use ParentNode, TemplateParent, Bindable;
-
-	protected $componentDirectory;
-	protected $templateFragmentMap;
-	protected $templateParentStack;
-	protected $boundAttributeList;
-
-	public function __construct(string $document = "", string $componentDirectory = "") {
-		parent::__construct($document);
-
-		$this->registerNodeClass(DOMDocument::class, Document::class);
-		$this->registerNodeClass(DOMElement::class, Element::class);
-		$this->registerNodeClass(DOMDocumentFragment::class, DocumentFragment::class);
-
-		$this->componentDirectory = $componentDirectory;
-		$this->templateFragmentMap = [];
-		$this->templateParentStack = [];
-		$this->boundAttributeList = [];
-	}
-
-	public function getComponentDirectory():string {
-		return $this->componentDirectory;
-	}
-
-	public function getNamedTemplate(string $name):?DocumentFragment {
-		/** @var \Gt\DomTemplate\DocumentFragment $fragment */
-		$fragment = $this->templateFragmentMap[$name] ?? null;
-
-		if($fragment) {
-			/** @var DocumentFragment $clone */
-			$clone = $fragment->cloneNode(true);
-			$clone->setTemplateProperties(
-				$fragment->templateParentNode,
-				$fragment->templateNextElementSibling,
-				$fragment->templatePreviousElementSibling
-			);
-
-			return $clone;
-		}
-
-		return null;
-	}
-
-	public function getUnnamedTemplate(
-		Element $element,
-		bool $throwIfMoreThanOneMatch = true,
-		bool $stripArraySyntax = true
-	):?DocumentFragment {
-		$path = $element->getNodePath();
-// Unnamed templates can't have sibling elements of the same path, otherwise
-// they would need to be named. Remove any index from the path.
-		if($stripArraySyntax) {
-			$path = preg_replace("/\[\d+\]/", "", $path);
-		}
-		$matches = [];
-
-		foreach($this->templateFragmentMap as $name => $t) {
-			if(strpos($name, $path) === 0) {
-				$matches []= $t;
-			}
-		}
-
-		if(count($matches) > 1
-		&& $throwIfMoreThanOneMatch) {
-			throw new NamelessTemplateSpecificityException();
-		}
-
-		if(!isset($matches[0])) {
-			return null;
-		}
-
-		/** @var DocumentFragment $fragment */
-		$fragment = $matches[0];
-		/** @var DocumentFragment $clone */
-		$clone = $fragment->cloneNode(true);
-		$clone->setTemplateProperties(
-			$fragment->templateParentNode,
-			$fragment->templateNextElementSibling,
-			$fragment->templatePreviousElementSibling
-		);
-
-		return $clone;
-	}
-
-	public function getParentOfUnnamedTemplate(
-		Element $element,
-		bool $requireMatchingPath = false
-	):?Element {
-		$path = $element->getNodePath();
-// Unnamed templates can't have sibling elements of the same path, otherwise
-// they would need to be named. Remove any index from the path.
-		$path = preg_replace("/\[\d+\]/", "", $path);
-		$pathToReturn = null;
-
-		foreach($this->templateFragmentMap as $name => $t) {
-			if(strpos($name, $path) !== 0) {
-				continue;
-			}
-
-			$pathToReturn = substr(
-				$name,
-				0,
-				strrpos($name, "/")
-			);
-
-			if($requireMatchingPath) {
-				if(strpos($name, $path) === 0
-				&& $path !== $name) {
-					break;
-				}
-			}
-			else {
-				break;
-			}
-		}
-
-		if(!$pathToReturn) {
-			return null;
-		}
-
-		/** @var Element[] $matchingElements */
-		$matchingElements =  $this->xPath($pathToReturn);
-		return $matchingElements[count($matchingElements) - 1];
-	}
-
-	/**
-	 * @return \Gt\Dom\DocumentFragment[]
-	 */
-	public function getNamedTemplateChildren(string...$namesToMatch):array {
-		$children = [];
-
-		foreach($this->templateFragmentMap as $templateName => $fragment) {
-// We want a match of any non-named templates that were originally children of the named path.
-			foreach($namesToMatch as $name) {
-				if(strpos($templateName, $name) === 0) {
-					$children []= $fragment;
-				}
-			}
-		}
-
-		return $children;
-	}
-
-	public function setNamedTemplate(string $name, BaseDocumentFragment $fragment):void {
-		if($name[0] !== "/") {
-			foreach($fragment->children as $child) {
-				$child->classList->add("t-$name");
-			}
-		}
-
-		$this->templateFragmentMap[$name] = $fragment;
-	}
-
-	public function createTemplateFragment(DOMElement $templateElement):BaseDocumentFragment {
-		/** @var BaseDocumentFragment $fragment */
-		$fragment = $this->createDocumentFragment();
-
-		if($templateElement->tagName === "template") {
-			while(!is_null($templateElement->childNodes[0])) {
-				$fragment->appendChild(
-					$templateElement->childNodes[0]
-				);
-			}
-		}
-		else {
-			$fragment->appendChild($templateElement);
-		}
-
-		return $fragment;
-	}
-
-	public function storeBoundAttribute(BaseAttr $attr) {
-		$this->boundAttributeList []= $attr;
-	}
-
-	public function validateBinds():void {
-		$allBindableElements = $this->getAllDomTemplateElements();
-
-		foreach($allBindableElements as $element) {
-			foreach($element->attributes as $attr) {
-				if(strpos($attr->name, "data-bind") !== 0) {
-					continue;
-				}
-
-				if(in_array($attr, $this->boundAttributeList)) {
-					throw new BoundDataNotSetException(
-						$attr->value
-					);
-				}
-			}
-		}
-	}
-
-	public function removeTemplateAttributes():void {
-		$allBindableElements = $this->getAllDomTemplateElements();
-
-		foreach($allBindableElements as $element) {
-			$attributesToRemove = [];
-			foreach($element->attributes as $attr) {
-				/** @var \Gt\Dom\Attr $attr */
-				if(strpos($attr->name, "data-bind") === 0
-				|| strpos($attr->name, "data-template") === 0) {
-					$attributesToRemove []= $attr->name;
-				}
-			}
-
-			foreach($attributesToRemove as $name) {
-				$element->removeAttribute($name);
-			}
-		}
-	}
-
-	protected function getAllDomTemplateElements():BaseHTMLCollection {
-		return $this->documentElement->xPath(
-			"descendant-or-self::*[@*[starts-with(name(), 'data-bind')]]|descendant-or-self::*[@*[starts-with(name(), 'data-template')]]"
-		);
-	}
-}
\ No newline at end of file
diff --git a/src/IncompatibleBindDataException.php b/src/IncompatibleBindDataException.php
index 00d6bbf..64e8403 100644
--- a/src/IncompatibleBindDataException.php
+++ b/src/IncompatibleBindDataException.php
@@ -1,4 +1,6 @@
 <?php
 namespace Gt\DomTemplate;
 
-class IncompatibleBindDataException extends DomTemplateException {}
\ No newline at end of file
+class IncompatibleBindDataException extends DomTemplateException {
+
+}
diff --git a/src/IncorrectTableDataFormat.php b/src/IncorrectTableDataFormat.php
new file mode 100644
index 0000000..b95d2f6
--- /dev/null
+++ b/src/IncorrectTableDataFormat.php
@@ -0,0 +1,4 @@
+<?php
+namespace Gt\DomTemplate;
+
+class IncorrectTableDataFormat extends DomTemplateException {}
diff --git a/src/InvalidBindProperty.php b/src/InvalidBindProperty.php
deleted file mode 100644
index 667929e..0000000
--- a/src/InvalidBindProperty.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-class InvalidBindProperty extends DomTemplateException {}
\ No newline at end of file
diff --git a/src/InvalidBindPropertyException.php b/src/InvalidBindPropertyException.php
new file mode 100644
index 0000000..dff91be
--- /dev/null
+++ b/src/InvalidBindPropertyException.php
@@ -0,0 +1,5 @@
+<?php
+namespace Gt\DomTemplate;
+
+class InvalidBindPropertyException extends DomTemplateException {
+}
diff --git a/src/InvalidTemplateElementNameException.php b/src/InvalidTemplateElementNameException.php
new file mode 100644
index 0000000..d78d6bd
--- /dev/null
+++ b/src/InvalidTemplateElementNameException.php
@@ -0,0 +1,4 @@
+<?php
+namespace Gt\DomTemplate;
+
+class InvalidTemplateElementNameException extends DomTemplateException {}
diff --git a/src/ListBinder.php b/src/ListBinder.php
new file mode 100644
index 0000000..50db72a
--- /dev/null
+++ b/src/ListBinder.php
@@ -0,0 +1,152 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Document;
+use Gt\Dom\Element;
+use Iterator;
+use ReflectionAttribute;
+use ReflectionClass;
+use ReflectionMethod;
+use ReflectionProperty;
+use Stringable;
+
+class ListBinder {
+	public function __construct(
+		private TemplateCollection $templateCollection
+	) {
+	}
+
+	/** @param Iterator<mixed> $listData */
+	public function bindListData(
+		iterable $listData,
+		Document|Element $context,
+		?string $templateName = null
+	):int {
+		if($context instanceof Document) {
+			$context = $context->documentElement;
+		}
+
+		if($this->isEmpty($listData)) {
+			$this->clearTemplateParentHTML($context, $templateName);
+			return 0;
+		}
+
+		$templateItem = $this->templateCollection->get(
+			$context,
+			$templateName
+		);
+
+		$binder = new ElementBinder();
+		$nestedCount = 0;
+		$i = -1;
+		foreach($listData as $listKey => $listItem) {
+			$i++;
+			$t = $templateItem->insertTemplate();
+
+// If the $listItem's first value is iterable, then treat this as a nested list.
+			if($this->isNested($listItem)) {
+				$binder->bind(null, $listKey, $t);
+				$nestedCount += $this->bindListData(
+					$listItem,
+					$t,
+					$templateName
+				);
+				continue;
+			}
+
+			if($this->hasBindAttributes($listItem)) {
+				$binder->bindMethodPropertyAttributes($listItem, $t);
+			}
+			elseif($this->isKVP($listItem)) {
+				foreach($listItem as $key => $value) {
+					$binder->bind($key, $value, $t);
+
+					if($this->isNested($value)) {
+						$binder->bind(null, $key, $t);
+						$nestedCount += $this->bindListData(
+							$value,
+							$t,
+							$templateName
+						);
+					}
+				}
+			}
+			else {
+				$binder->bind(null, $listItem, $t);
+			}
+		}
+
+		return $nestedCount + $i + 1;
+	}
+
+	/** @param Iterator<mixed>|array<mixed> $listData */
+	private function isEmpty(iterable $listData):bool {
+		if(is_array($listData)) {
+			return is_null(array_key_first($listData));
+		}
+		else {
+			/** @var Iterator<mixed> $listData */
+			$listData->rewind();
+			return !$listData->valid();
+		}
+	}
+
+	private function clearTemplateParentHTML(
+		Element $context,
+		?string $templateName
+	):void {
+		$template = $this->templateCollection->get($context, $templateName);
+		$parent = $template->getTemplateParent();
+		$parent->innerHTML = trim($parent->innerHTML);
+	}
+
+	private function isKVP(mixed $item):bool {
+		if(is_scalar($item)) {
+			return false;
+		}
+
+		if($item instanceof Stringable) {
+			return false;
+		}
+
+		return true;
+	}
+
+	private function hasBindAttributes(mixed $item):bool {
+		if(is_scalar($item) || is_array($item)) {
+			return false;
+		}
+
+		/** @var array<ReflectionAttribute<object>> $attributeList */
+		$attributeList = [];
+
+		$refClass = new ReflectionClass($item);
+		foreach($refClass->getMethods(ReflectionMethod::IS_PUBLIC) as $refMethod) {
+			array_push($attributeList, ...$refMethod->getAttributes());
+		}
+
+		foreach($refClass->getProperties(ReflectionProperty::IS_PUBLIC) as $refProperty) {
+			array_push($attributeList, ...$refProperty->getAttributes());
+		}
+
+		foreach($attributeList as $attribute) {
+			if($attribute->getName() === Bind::class) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private function isNested(mixed $item):bool {
+		if(is_array($item)) {
+			$key = array_key_first($item);
+			return is_int($key) || is_iterable($item[$key]);
+		}
+		elseif($item instanceof Iterator) {
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/src/ModularContent.php b/src/ModularContent.php
new file mode 100644
index 0000000..106ebe4
--- /dev/null
+++ b/src/ModularContent.php
@@ -0,0 +1,27 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\HTMLDocument;
+
+class ModularContent {
+	public function __construct(
+		private string $dirPath
+	) {
+		if(!is_dir($this->dirPath)) {
+			throw new ModularContentDirectoryNotFoundException("The modular content path does not exist: $this->dirPath");
+		}
+	}
+
+	public function getContent(string $name, string $extension = "html"):string {
+		$filePath = $this->dirPath . "/" . $name . ".$extension";
+		if(!is_file($filePath)) {
+			throw new ModularContentFileNotFoundException("The modular content file does not exist: $filePath");
+		}
+
+		return file_get_contents($filePath);
+	}
+
+	public function getHTMLDocument(string $name):HTMLDocument {
+		return new HTMLDocument($this->getContent($name));
+	}
+}
diff --git a/src/ModularContentDirectoryNotFoundException.php b/src/ModularContentDirectoryNotFoundException.php
new file mode 100644
index 0000000..6c60df9
--- /dev/null
+++ b/src/ModularContentDirectoryNotFoundException.php
@@ -0,0 +1,4 @@
+<?php
+namespace Gt\DomTemplate;
+
+class ModularContentDirectoryNotFoundException extends DomTemplateException {}
diff --git a/src/ModularContentExpander.php b/src/ModularContentExpander.php
new file mode 100644
index 0000000..d536637
--- /dev/null
+++ b/src/ModularContentExpander.php
@@ -0,0 +1,15 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Document;
+
+abstract class ModularContentExpander {
+	public function __construct(
+		protected Document $document,
+		protected ModularContent $modularContent
+	) {
+	}
+
+	/** @return array<int, mixed> */
+	abstract public function expand():array;
+}
diff --git a/src/ModularContentFileNotFoundException.php b/src/ModularContentFileNotFoundException.php
new file mode 100644
index 0000000..c09b43d
--- /dev/null
+++ b/src/ModularContentFileNotFoundException.php
@@ -0,0 +1,4 @@
+<?php
+namespace Gt\DomTemplate;
+
+class ModularContentFileNotFoundException extends DomTemplateException {}
diff --git a/src/NamelessTemplateSpecificityException.php b/src/NamelessTemplateSpecificityException.php
deleted file mode 100644
index 12955c1..0000000
--- a/src/NamelessTemplateSpecificityException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-class NamelessTemplateSpecificityException extends DomTemplateException {}
\ No newline at end of file
diff --git a/src/Node.php b/src/Node.php
deleted file mode 100644
index c32328b..0000000
--- a/src/Node.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use DOMNode;
-use Gt\Dom\Node as BaseNode;
-
-/**
- * @method Node|Element appendChild(DOMNode $newnode)
- * @method Node|Element cloneNode(bool $deep = false)
- * @method Node|Element insertBefore(DOMNode $newnode, DOMNode $refnode = null)
- * @method Node|Element removeChild(DOMNode $oldnode)
- * @method Node|Element replaceChild(DOMNode $newnode, DOMNode $oldnode)
- *
- * @property-read ?Node $parentNode
- * @property-read ?Node $firstChild
- * @property-read ?Node $lastChild
- * @property-read ?Node $previousSibling
- * @property-read ?Node $nextSibling
- */
-class Node extends BaseNode {
-	use NonDocumentTypeChildNode, ChildNode, ParentNode,
-		TemplateParent, Bindable;
-}
\ No newline at end of file
diff --git a/src/NodeList.php b/src/NodeList.php
deleted file mode 100644
index 6baef5e..0000000
--- a/src/NodeList.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use Gt\Dom\NodeList as BaseNodeList;
-
-/**
- * @method Element|null item(int $index)
- * @method Element|null current()
- * @method Element|null offsetGet(string $offset)
- */
-class NodeList extends BaseNodeList {}
\ No newline at end of file
diff --git a/src/NodePathCalculator.php b/src/NodePathCalculator.php
new file mode 100644
index 0000000..3fc44d8
--- /dev/null
+++ b/src/NodePathCalculator.php
@@ -0,0 +1,22 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Node;
+use Gt\Dom\Facade\NodeClass\DOMElementFacade;
+use Stringable;
+
+class NodePathCalculator implements Stringable {
+	public function __construct(
+		private Node $element
+	) {
+	}
+
+	public function __toString():string {
+		$refObj = new \ReflectionObject($this->element);
+		$refProp = $refObj->getProperty("domNode");
+		$refProp->setAccessible(true);
+		/** @var DOMElementFacade $nativeDomNode */
+		$nativeDomNode = $refProp->getValue($this->element);
+		return $nativeDomNode->getNodePath();
+	}
+}
diff --git a/src/NonDocumentTypeChildNode.php b/src/NonDocumentTypeChildNode.php
deleted file mode 100644
index ed765de..0000000
--- a/src/NonDocumentTypeChildNode.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-/**
- * @property-read Element|null $previousElementSibling The Element immediately
- *  prior to this Node in its parent's $children list, or null if there is no
- *  Element in the list prior to this Node.
- * @property-read Element|null $nextElementSibling The Element immediately
- *  following this Node in its parent's children list, or null if there is no
- *  Element in the list following this node.
- */
-trait NonDocumentTypeChildNode {}
\ No newline at end of file
diff --git a/src/ParentNode.php b/src/ParentNode.php
deleted file mode 100644
index 6256af7..0000000
--- a/src/ParentNode.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use DOMNode;
-
-/**
- * @property-read HTMLCollection $children A live HTMLCollection containing all
- *  objects of type Element that are children of this ParentNode.
- * @property-read Node|Element|null $firstChild
- * @property-read Element|null $firstElementChild The Element that is the first
- *  child of this ParentNode.
- * @property-read Node|Element|null $lastChild
- * @property-read Element|null $lastElementChild The Element that is the last
- *  child of this ParentNode.
- * @property-read int $childElementCount The amount of children that the
- *  ParentNode has.
- *
- * @method Element getElementById(string $id)
- * @method Node|Element importNode(DOMNode $importedNode, bool $deep = false)
- * @method Node|Element insertBefore(DOMNode $newNode, DOMNode $refNode = false)
- * @method Node|Element removeChild(DOMNode $oldNode)
- * @method Node|Element replaceChild(DOMNode $newNode, DOMNode $oldNode)
- *
- * @method Element|null querySelector(string $selector)
- * @method HTMLCollection querySelectorAll(string $selector)
- * @method HTMLCollection css(string $selector, string $prefix = "descendant-or-self::")
- * @method HTMLCollection xPath(string $selector)
- * @method HTMLCollection getElementsByTagName(string $tag)
- */
-trait ParentNode {}
\ No newline at end of file
diff --git a/src/PartialExpander.php b/src/PartialExpander.php
new file mode 100644
index 0000000..42e933a
--- /dev/null
+++ b/src/PartialExpander.php
@@ -0,0 +1,65 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Element;
+use Gt\Dom\HTMLDocument;
+use Gt\Dom\HTMLElement\HTMLElement;
+
+class PartialExpander extends ModularContentExpander {
+	/**
+	 * @return string[] A list of names of partials that have been expanded,
+	 * in the order that they were expanded.
+	 */
+	public function expand(Element $context = null):array {
+		if(!$context) {
+			$context = $this->document->documentElement;
+		}
+
+		/** @var HTMLDocument[] $partialDocumentArray */
+		$partialDocumentArray = [];
+		do {
+			$commentIni = new CommentIni($context);
+			$extends = $commentIni->get("extends");
+			if(is_null($extends)) {
+				break;
+			}
+
+			$partialDocument = $this->modularContent->getHTMLDocument($extends);
+			$partialDocumentArray[$extends] = $partialDocument;
+			$context = $partialDocument;
+		}
+		while(true);
+
+		foreach($partialDocumentArray as $partialDocument) {
+			if($currentTitle = $this->document->title) {
+				$partialDocument->title = $currentTitle;
+			}
+
+			/** @var HTMLElement $importedRoot */
+			$importedRoot = $this->document->importNode(
+				$partialDocument->documentElement,
+				true
+			);
+			$injectionPoint = $importedRoot->querySelector("[data-partial]");
+
+// Move all the current document's content into the newly-imported injection point:
+			while($child = $this->document->body->firstChild) {
+				$injectionPoint->appendChild($child);
+			}
+
+// Remove everything from the current document element, to replace with the
+// newly imported and newly injected partial document elements.
+			while($child = $this->document->documentElement->firstChild) {
+				$child->parentNode->removeChild($child);
+			}
+
+// Attach all the newly-imported nodes back to the current document, now with
+// our current document already injected at the correct node.
+			while($child = $importedRoot->firstChild) {
+				$this->document->documentElement->appendChild($child);
+			}
+		}
+
+		return array_keys($partialDocumentArray);
+	}
+}
diff --git a/src/PlaceholderBinder.php b/src/PlaceholderBinder.php
new file mode 100644
index 0000000..7a8e2e7
--- /dev/null
+++ b/src/PlaceholderBinder.php
@@ -0,0 +1,51 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Attr;
+use Gt\Dom\Document;
+use Gt\Dom\Node;
+use Gt\Dom\Text;
+
+class PlaceholderBinder {
+	public function bind(
+		?string $key,
+		mixed $value,
+		Node|Document $context
+	):void {
+		if($context instanceof Document) {
+			$context = $context->documentElement;
+		}
+
+// The XPath query is split into two, separated by the pipe character (|).
+// The first query: //text()[contains(.,'{{')] finds any Text nodes that contain
+// two opening curly braces.
+// The second query: //@*[contains(.,'{{')] finds any Attr nodes that contain
+// two opening curly braces.
+// NOTE: An Attr node's value is represented by a Text node.
+		$xpathResult = $context->ownerDocument->evaluate(
+			".//text()[contains(.,'{{')] | .//@*[contains(.,'{{')]",
+			$context
+		);
+
+		foreach($xpathResult as $attributeOrText) {
+			$text = $attributeOrText;
+			if($text instanceof Attr) {
+				$text = $text->firstChild;
+			}
+			/** @var Text $text */
+			$placeholder = $text->splitText(
+				strpos($text->data, "{{")
+			);
+			$placeholder->splitText(
+				strpos($placeholder->data, "}}") + 2
+			);
+
+			$placeholderText = new PlaceholderText($placeholder);
+			if($key !== $placeholderText->getBindKey()) {
+				continue;
+			}
+
+			$placeholderText->setValue($value);
+		}
+	}
+}
diff --git a/src/PlaceholderText.php b/src/PlaceholderText.php
new file mode 100644
index 0000000..70abbf2
--- /dev/null
+++ b/src/PlaceholderText.php
@@ -0,0 +1,46 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Element;
+use Gt\Dom\Text;
+
+class PlaceholderText {
+	private string $bindKey;
+	private ?string $default;
+
+	public function __construct(
+		private Text $originalText
+	) {
+		$this->process();
+	}
+
+	public function getBindKey():string {
+		return $this->bindKey;
+	}
+
+	private function process():void {
+		$data = trim($this->originalText->data, "{}");
+		$this->bindKey = $this->parseBindKey($data);
+		$this->default = $this->parseDefault($data);
+	}
+
+	private function parseBindKey(string $data):string {
+		$bindKey = strtok($data, "?");
+		$bindKey = strtok($bindKey, ":");
+		return trim($bindKey);
+	}
+
+	private function parseDefault(string $data):?string {
+		$nullCoalescePos = strpos($data, "??");
+		if($nullCoalescePos === false) {
+			return null;
+		}
+
+		$default = substr($data, $nullCoalescePos + 2);
+		return trim($default);
+	}
+
+	public function setValue(mixed $value):void {
+		$this->originalText->data = (string)$value;
+	}
+}
diff --git a/src/StringMap.php b/src/StringMap.php
deleted file mode 100644
index ac52945..0000000
--- a/src/StringMap.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use Gt\Dom\StringMap as BaseStringMap;
-
-class StringMap extends BaseStringMap {}
\ No newline at end of file
diff --git a/src/TableBinder.php b/src/TableBinder.php
new file mode 100644
index 0000000..a0a59b2
--- /dev/null
+++ b/src/TableBinder.php
@@ -0,0 +1,179 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Document;
+use Gt\Dom\Element;
+use Gt\Dom\HTMLElement\HTMLTableCellElement;
+use Gt\Dom\HTMLElement\HTMLTableElement;
+use Gt\Dom\HTMLElement\HTMLTableRowElement;
+use Gt\Dom\HTMLElement\HTMLTableSectionElement;
+use Stringable;
+
+class TableBinder {
+	/**
+	 * @param array<int, array<int, string>>|array<int, array<int|string, string|array<int, mixed>>> $tableData
+	 * @param Element $context
+	 */
+	public function bindTableData(
+		array $tableData,
+		Document|Element $context
+	):void {
+		$tableData = $this->normaliseTableData($tableData);
+
+		if($context instanceof Document) {
+			$context = $context->documentElement;
+		}
+
+		$tableArray = [$context];
+		if(!$context instanceof HTMLTableElement) {
+			$tableArray = [];
+			foreach($context->querySelectorAll("table") as $table) {
+				array_push($tableArray, $table);
+			}
+		}
+
+		if(empty($tableArray)) {
+			throw new TableElementNotFoundInContextException();
+		}
+
+		$headerRow = array_shift($tableData);
+		foreach($tableArray as $table) {
+			/** @var HTMLTableElement $table */
+
+			$allowedHeaders = $headerRow;
+
+			$tHead = $table->tHead;
+			if($tHead) {
+				$allowedHeaders = [];
+
+				/** @var HTMLTableRowElement $tHeadRow */
+				$tHeadRow = $tHead->rows[0];
+				foreach($tHeadRow->cells as $cell) {
+					/** @var HTMLTableCellElement $cell */
+					$headerKey = $cell->hasAttribute("data-table-key")
+						? $cell->getAttribute("data-table-key")
+						: trim($cell->textContent);
+					array_push($allowedHeaders, $headerKey);
+				}
+			}
+			else {
+				$tHead = $table->createTHead();
+				$theadTr = $tHead->insertRow();
+
+				foreach($headerRow as $value) {
+					$th = $theadTr->insertCell();
+					$th->textContent = $value;
+				}
+			}
+
+			/** @var ?HTMLTableSectionElement $tbody */
+			$tbody = $table->tBodies[0] ?? null;
+			if(!$tbody) {
+				$tbody = $table->createTBody();
+			}
+
+			foreach($tableData as $rowData) {
+				$tr = $tbody->insertRow();
+				/** @var int|string|null $firstKey */
+				$firstKey = key($rowData);
+
+				foreach($allowedHeaders as $allowedHeader) {
+					$rowIndex = array_search($allowedHeader, $headerRow);
+					$cellTypeToCreate = "td";
+
+					if(is_string($firstKey)) {
+						if($rowIndex === 0) {
+							$columnValue = $firstKey;
+							$cellTypeToCreate = "th";
+						}
+						else {
+							$columnValue = $rowData[$firstKey][$rowIndex - 1];
+						}
+					}
+					else {
+						$columnValue = $rowData[$rowIndex];
+					}
+
+					$cellElement = $tr->ownerDocument->createElement($cellTypeToCreate);
+					$cellElement->textContent = $columnValue;
+					$tr->appendChild($cellElement);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param iterable<int,iterable<int,string>>|iterable<string,iterable<int, string>>|iterable<string,iterable<string, iterable<int, string>>> $bindValue
+	 * The three structures allowed by this method are:
+	 * 1) If $bindValue has int keys, the first value must represent an
+	 * iterable of columnHeaders, and subsequent values must represent an
+	 * iterable of columnValues.
+	 * 2) If $bindValue has string keys, the keys must represent the column
+	 * headers and the value must be an iterable of columnValues.
+	 * 3) If columnValues has int keys, each item represents the value of
+	 * a column <td> element.
+	 * 4) If columnValues has a string keys, each key represents a <th> and
+	 * each sub-iterable represents the remaining column values.
+	 * @return array<int, array<int|string, string|Stringable>> A
+	 * two-dimensional array where the outer array represents the rows, the
+	 * inner array represents the columns.
+	 */
+	private function normaliseTableData(iterable $bindValue):array {
+		$normalised = [];
+
+		reset($bindValue);
+		$key = key($bindValue);
+
+		if(is_int($key)) {
+			foreach($bindValue as $i => $value) {
+				if(!is_iterable($value)) {
+					throw new IncorrectTableDataFormat("Row $i data is not iterable.");
+				}
+				$row = [];
+
+				foreach($value as $j => $columnValue) {
+// A string key within the inner array indicates "double header" table data.
+					if(is_string($j)) {
+						$doubleHeader = [$j => []];
+						if(!is_iterable($columnValue)) {
+							throw new IncorrectTableDataFormat("Row $i has a string key ($j) but the value is not iterable.");
+						}
+
+						foreach($columnValue as $cellValue) {
+							array_push($doubleHeader[$j], $cellValue);
+						}
+						array_push($normalised, $doubleHeader);
+					}
+					else {
+						array_push($row, $columnValue);
+					}
+				}
+				if(!empty($row)) {
+					array_push($normalised, $row);
+				}
+			}
+		}
+		else {
+			array_push($normalised, array_keys($bindValue));
+			$rows = [];
+
+			foreach($bindValue as $colName => $colValueList) {
+				if(!is_iterable($colValueList)) {
+					throw new IncorrectTableDataFormat("Column data \"$colName\" is not iterable.");
+				}
+
+				foreach($colValueList as $i => $colValue) {
+					if(!isset($rows[$i])) {
+						$rows[$i] = [];
+					}
+
+					array_push($rows[$i], $colValue);
+				}
+			}
+
+			array_push($normalised, ...$rows);
+		}
+
+		return $normalised;
+	}
+}
diff --git a/src/TableElementNotFoundInContextException.php b/src/TableElementNotFoundInContextException.php
new file mode 100644
index 0000000..31359df
--- /dev/null
+++ b/src/TableElementNotFoundInContextException.php
@@ -0,0 +1,4 @@
+<?php
+namespace Gt\DomTemplate;
+
+class TableElementNotFoundInContextException extends DomTemplateException {}
diff --git a/src/TemplateCollection.php b/src/TemplateCollection.php
new file mode 100644
index 0000000..7ab03f4
--- /dev/null
+++ b/src/TemplateCollection.php
@@ -0,0 +1,91 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Document;
+use Gt\Dom\Element;
+use Gt\Dom\Text;
+
+class TemplateCollection {
+	/** @var array<string, TemplateElement> */
+	private array $elementKVP;
+
+	public function __construct(
+		Document $document
+	) {
+		$this->elementKVP = [];
+		$this->extractTemplates($document);
+	}
+
+	public function get(
+		Element|Document $context,
+		?string $templateName = null
+	):TemplateElement {
+		if($context instanceof Document) {
+			$context = $context->documentElement;
+		}
+
+		if($templateName) {
+			if(!isset($this->elementKVP[$templateName])) {
+				throw new TemplateElementNotFoundInContextException("Template element with name \"$templateName\" can not be found within the context {$context->tagName} element.");
+			}
+			return $this->elementKVP[$templateName];
+		}
+
+		return $this->findMatch($context);
+	}
+
+	private function extractTemplates(Document $document):void {
+		$dataTemplateArray = [];
+		foreach($document->querySelectorAll("[data-template]") as $element) {
+			$nodePath = new NodePathCalculator($element);
+			$dataTemplateArray[(string)$nodePath] = $element;
+		}
+
+		uksort($dataTemplateArray,
+			fn(string $a, string $b):int => (
+				(strlen($a) > strlen($b))
+				? -1
+				: 1
+			)
+		);
+
+		foreach($dataTemplateArray as $nodePath => $element) {
+			$templateElement = new TemplateElement($element);
+			$name = $templateElement->getTemplateName() ?? $nodePath;
+			$this->elementKVP[$name] = $templateElement;
+		}
+
+		$this->elementKVP = array_reverse($this->elementKVP, true);
+	}
+
+	private function findMatch(Element $context):TemplateElement {
+		$contextPath = (string)(new NodePathCalculator($context));
+		$contextPath = preg_replace(
+			"/(\[\d+\])/",
+			"",
+			$contextPath
+		);
+
+		foreach($this->elementKVP as $name => $element) {
+			if($contextPath === $name) {
+				continue;
+			}
+
+			if(!str_starts_with($name, $contextPath)) {
+				continue;
+			}
+
+			$xpathResult = $context->ownerDocument->evaluate(
+				$contextPath
+			);
+
+			if($xpathResult->valid()) {
+				return $element;
+			}
+		}
+
+		throw new TemplateElementNotFoundInContextException(
+			"There is no unnamed template element in the context element ({$context->tagName})."
+		);
+	}
+}
diff --git a/src/TemplateComponentNotFoundException.php b/src/TemplateComponentNotFoundException.php
deleted file mode 100644
index 2353a6c..0000000
--- a/src/TemplateComponentNotFoundException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-class TemplateComponentNotFoundException extends DomTemplateException {}
\ No newline at end of file
diff --git a/src/TemplateElement.php b/src/TemplateElement.php
new file mode 100644
index 0000000..355a872
--- /dev/null
+++ b/src/TemplateElement.php
@@ -0,0 +1,96 @@
+<?php
+namespace Gt\DomTemplate;
+
+use Gt\Dom\Element;
+use Gt\Dom\Node;
+use Gt\Dom\Text;
+
+class TemplateElement {
+	private string $templateParentPath;
+	private ?string $templateNextSiblingPath;
+
+	public function __construct(
+		private Element $originalElement
+	) {
+		$this->templateParentPath = new NodePathCalculator($this->originalElement->parentElement);
+
+		$siblingContext = $this->originalElement;
+		while($siblingContext = $siblingContext->nextSibling) {
+			/** @var Element|Text $siblingContext */
+			if($siblingContext instanceof Text
+			|| !$siblingContext->hasAttribute("data-template")) {
+				break;
+			}
+		}
+		$this->templateNextSiblingPath =
+			is_null($siblingContext)
+			? null
+			: new NodePathCalculator($this->originalElement->nextSibling);
+
+		$this->originalElement->remove();
+	}
+
+	public function getClone():Element {
+		/** @var Element $element */
+		/** @noinspection PhpUnnecessaryLocalVariableInspection */
+		$element = $this->originalElement->cloneNode(true);
+		return $element;
+	}
+
+	/**
+	 * Inserts a deep clone of the original element in place where it was
+	 * originally extracted from the document, returning the newly-inserted
+	 * clone.
+	 */
+	public function insertTemplate():Element {
+		$clone = $this->getClone();
+		$templateParent = $this->getTemplateParent();
+		$templateParent->insertBefore(
+			$clone,
+			$this->getTemplateNextSibling()
+		);
+
+		return $clone;
+	}
+
+	public function getTemplateParent():Element {
+		$matches = $this->originalElement->ownerDocument->evaluate(
+			$this->templateParentPath
+		);
+		do {
+			/** @var Element $parent */
+			$parent = $matches->current();
+			$matches->next();
+		}
+		while($matches->valid());
+		return $parent;
+	}
+
+	public function getTemplateNextSibling():?Node {
+		if(is_null($this->templateNextSiblingPath)) {
+			return null;
+		}
+
+		$matches = $this->originalElement->ownerDocument->evaluate(
+			$this->templateNextSiblingPath
+		);
+		$sibling = null;
+		while($matches->valid()) {
+			$sibling = $matches->current();
+			$matches->next();
+		}
+		return $sibling;
+	}
+
+	public function getTemplateName():?string {
+		$templateName = $this->originalElement->getAttribute("data-template");
+		if(strlen($templateName) === 0) {
+			return null;
+		}
+		elseif($templateName[0] === "/") {
+			throw new InvalidTemplateElementNameException("A template's name must not start with a forward slash (\"$templateName\")");
+		}
+
+		return $templateName;
+	}
+}
diff --git a/src/TemplateElementNotFoundFoundException.php b/src/TemplateElementNotFoundFoundException.php
deleted file mode 100644
index 2ebb845..0000000
--- a/src/TemplateElementNotFoundFoundException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-class TemplateElementNotFoundFoundException extends DomTemplateException {}
\ No newline at end of file
diff --git a/src/TemplateElementNotFoundInContextException.php b/src/TemplateElementNotFoundInContextException.php
new file mode 100644
index 0000000..ef2fb4a
--- /dev/null
+++ b/src/TemplateElementNotFoundInContextException.php
@@ -0,0 +1,4 @@
+<?php
+namespace Gt\DomTemplate;
+
+class TemplateElementNotFoundInContextException extends DomTemplateException {}
diff --git a/src/TemplateHasNoParentException.php b/src/TemplateHasNoParentException.php
deleted file mode 100644
index 279ca8a..0000000
--- a/src/TemplateHasNoParentException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-class TemplateHasNoParentException extends DomTemplateException {}
\ No newline at end of file
diff --git a/src/TemplateParent.php b/src/TemplateParent.php
deleted file mode 100644
index ae16189..0000000
--- a/src/TemplateParent.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use DirectoryIterator;
-use DOMDocument;
-use Gt\Dom\Element as BaseElement;
-
-trait TemplateParent {
-	public function extractTemplates(BaseElement $context = null):int {
-		if(is_null($context)) {
-			$context = $this;
-		}
-
-		$i = null;
-		/** @var HTMLCollection $templateElementList */
-		$templateElementList = $context->querySelectorAll(
-			"template,[data-template]"
-		);
-
-		$count = count($templateElementList) - 1;
-
-		for($i = $count; $i >= 0; $i--) {
-			$templateElement = $templateElementList[$i];
-			$name = $this->getTemplateNameFromElement($templateElement);
-
-			$parentNode = $templateElement->parentNode;
-			$nextElementSibling = $templateElement->nextElementSibling;
-			$previousElementSibling = $templateElement->previousElementSibling;
-			$templateNodePath = $templateElement->getNodePath();
-
-			$nestedTemplateElementList = $templateElement->querySelectorAll(
-				"template,[data-template]"
-			);
-			foreach($nestedTemplateElementList as $nestedTemplateElement) {
-				$this->extractTemplates($nestedTemplateElement);
-			}
-
-			$document = ($this instanceof DOMDocument)
-				? $this
-				: $this->ownerDocument;
-
-			/** @var DocumentFragment $fragment */
-			$fragment = $document->createTemplateFragment(
-				$templateElement
-			);
-			$fragment->setTemplateProperties(
-				$parentNode,
-				$nextElementSibling,
-				$previousElementSibling
-			);
-			$fragment->expandComponents();
-
-			/** @var HTMLDocument $rootDocument */
-			$rootDocument = $this->getRootDocument();
-			$rootDocument->setNamedTemplate($name, $fragment);
-// Also set the template element with its path name.
-			$rootDocument->setNamedTemplate(
-				$templateNodePath,
-				$fragment
-			);
-
-			if($templateElement->getAttribute("data-template")) {
-				$templateElement->removeAttribute("data-template");
-			}
-
-			if($templateElement->parentNode === $parentNode) {
-				$parentNode->removeChild($templateElement);
-			}
-
-			if(count($parentNode->children) === 0) {
-				$parentNode->innerHTML = "";
-			}
-
-			if($name[0] !== "/") {
-				$templateElement->classList->add("t-$name");
-			}
-		}
-
-		if($this instanceof HTMLDocument) {
-			ksort($this->templateFragmentMap);
-		}
-
-		if(is_null($count)) {
-			return 0;
-		}
-
-		return $count + 1;
-	}
-
-	public function getTemplate(
-		string $name = null,
-		string $templateDirectory = null,
-		bool $addTemplatePrefix = true
-	):DocumentFragment {
-		/** @var Element $element */
-		$element = $this;
-
-		/** @var HTMLDocument $rootDocument */
-		$rootDocument = $element->getRootDocument();
-
-		if(is_null($name)) {
-			$docTemplate = $rootDocument->getUnnamedTemplate(
-				$element,
-				false
-			);
-		}
-		else {
-			$docTemplate = $rootDocument->getNamedTemplate($name);
-		}
-		if(!is_null($docTemplate)) {
-			return $docTemplate;
-		}
-
-		if(is_null($templateDirectory)) {
-			$templateDirectory = $element->componentDirectory;
-		}
-
-		if(is_dir($templateDirectory)) {
-			foreach(new DirectoryIterator($templateDirectory) as $fileInfo) {
-				if(!$fileInfo->isFile()) {
-					continue;
-				}
-
-				$fileName = $fileInfo->getFilename();
-				$fileName = strtok($fileName, ".");
-
-				if($name === $fileName) {
-					$component = $element->loadComponent(
-						$name,
-						dirname($fileInfo->getRealPath())
-					);
-
-					foreach($component->children as $child) {
-						$child->classList->add("c-$name");
-
-						if($addTemplatePrefix) {
-							$child->classList->add("t-$name");
-						}
-					}
-
-					return $component;
-				}
-			}
-		}
-
-		throw new TemplateComponentNotFoundException($name);
-	}
-
-	public function expandComponents(string $templateDirectory = null):int {
-		if(is_null($templateDirectory)) {
-			if($this instanceof HTMLDocument) {
-				$templateDirectory = $this->componentDirectory;
-			}
-			else {
-				$templateDirectory = $this->ownerDocument->getComponentDirectory();
-			}
-		}
-
-// Any HTML element is considered a "custom element" if it contains a hyphen in its name:
-// @see https://www.w3.org/TR/custom-elements/#valid-custom-element-name
-		/** @var HTMLCollection $componentList */
-		$componentList = $this->xPath(
-			"descendant-or-self::*[contains(local-name(), '-')]"
-		);
-		$count = 0;
-		foreach($componentList as $component) {
-			$name = $component->tagName;
-
-			try {
-				$fragment = $this->getTemplate(
-					$name,
-					$templateDirectory,
-					false
-				);
-			}
-			catch(TemplateComponentNotFoundException $exception) {
-				continue;
-			}
-
-			$fragment->expandComponents($templateDirectory);
-			foreach($fragment->children as $child) {
-				$existingClassName = $component->className ?? "";
-				$child->classList->add($existingClassName);
-				$child->classList->add("c-$name");
-			}
-
-			$component->replaceWith($fragment);
-			$count++;
-		}
-
-		return $count;
-	}
-
-	protected function loadComponent(string $name, string $path):DocumentFragment {
-		$filePath = $this->getTemplateFilePath($name, $path);
-
-		$html = file_get_contents($filePath);
-		/** @var DocumentFragment $fragment */
-		if(method_exists($this, "createDocumentFragment")) {
-			$fragment = $this->createDocumentFragment();
-		}
-		else {
-			/** @var HTMLDocument $ownerDocument */
-			$ownerDocument = $this->ownerDocument;
-			$fragment = $ownerDocument->createDocumentFragment();
-		}
-
-		$fragment->appendHTML($html);
-		return $fragment;
-	}
-
-	protected function getTemplateFilePath(string $name, string $path):string {
-		$templateFilePath = "";
-
-		foreach(new DirectoryIterator($path) as $fileInfo) {
-			if(!$fileInfo->isFile()) {
-				continue;
-			}
-
-			$fileName = $fileInfo->getFilename();
-			$noExt = strtok($fileName, ".");
-
-			if($name === $noExt) {
-				$templateFilePath = $fileInfo->getRealPath();
-			}
-		}
-
-		return $templateFilePath;
-	}
-
-	protected function getTemplateNameFromElement(BaseElement $element):string {
-		switch($element->tagName) {
-		case "template":
-			$name = $element->id;
-			break;
-
-		default:
-			$name = $element->getAttribute("data-template");
-			break;
-		}
-
-		if(strlen($name) === 0) {
-			$name = $element->getNodePath();
-		}
-
-		return $name;
-	}
-}
\ No newline at end of file
diff --git a/src/Text.php b/src/Text.php
deleted file mode 100644
index 8d0884f..0000000
--- a/src/Text.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use Gt\Dom\Text as BaseText;
-
-class Text extends BaseText {}
\ No newline at end of file
diff --git a/src/TokenList.php b/src/TokenList.php
deleted file mode 100644
index c2e1793..0000000
--- a/src/TokenList.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-use Gt\Dom\TokenList as BaseTokenList;
-
-class TokenList extends BaseTokenList {}
\ No newline at end of file
diff --git a/src/UnbindableObjectException.php b/src/UnbindableObjectException.php
deleted file mode 100644
index db65b50..0000000
--- a/src/UnbindableObjectException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-class UnbindableObjectException extends DomTemplateException {}
\ No newline at end of file
diff --git a/test/phpunit/BindDataGetterTest.php b/test/phpunit/BindDataGetterTest.php
deleted file mode 100644
index 5d0f520..0000000
--- a/test/phpunit/BindDataGetterTest.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-namespace Gt\DomTemplate\Test;
-
-use Gt\DomTemplate\BindObject;
-use Gt\DomTemplate\HTMLDocument;
-use Gt\DomTemplate\Test\Helper\BindDataGetter\TodoItem;
-use Gt\DomTemplate\Test\Helper\Helper;
-use PHPUnit\Framework\TestCase;
-
-class BindDataGetterTest extends TestCase {
-	public function testBindFunction() {
-		$id = rand(100, 1000);
-		$name = uniqid();
-		$sut = new TodoItem($id, $name);
-
-		$document = new HTMLDocument(Helper::HTML_TODO_LIST);
-		$document->extractTemplates();
-		$document->bindList([$sut]);
-
-		$li = $document->querySelector("li");
-		self::assertEquals($id, $li->querySelector("[name='id']")->value);
-		self::assertEquals($name, $li->querySelector("[name='title']")->value);
-	}
-}
\ No newline at end of file
diff --git a/test/phpunit/BindableTest.php b/test/phpunit/BindableTest.php
deleted file mode 100644
index 02d1038..0000000
--- a/test/phpunit/BindableTest.php
+++ /dev/null
@@ -1,795 +0,0 @@
-<?php /** @noinspection PhpComposerExtensionStubsInspection */
-namespace Gt\DomTemplate\Test;
-
-use ArrayObject;
-use EmptyIterator;
-use Gt\DomTemplate\IncompatibleBindDataException;
-use Gt\DomTemplate\BoundAttributeDoesNotExistException;
-use Gt\DomTemplate\BoundDataNotSetException;
-use Gt\DomTemplate\HTMLDocument;
-use Gt\DomTemplate\NamelessTemplateSpecificityException;
-use Gt\DomTemplate\Test\Helper\BindDataGetter\TodoItem;
-use Gt\DomTemplate\Test\Helper\Helper;
-use stdClass;
-
-class BindableTest extends TestCase {
-	public function testBindMethodAvailable() {
-		$document = new HTMLDocument(Helper::HTML_TEMPLATES);
-		$outputTo = $document->querySelector("dl");
-
-		self::assertTrue(
-			method_exists($document, "bindKeyValue"),
-			"HTMLDocument is not bindable"
-		);
-		self::assertTrue(
-			method_exists($document, "bindData"),
-			"HTMLDocument is not bindable"
-		);
-		self::assertTrue(
-			method_exists($document, "bindList"),
-			"HTMLDocument is not bindable"
-		);
-		self::assertTrue(
-			method_exists($outputTo, "bindKeyValue"),
-			"Template container element (dl) is not bindable"
-		);
-		self::assertTrue(
-			method_exists($outputTo, "bindData"),
-			"Template container element (dl) is not bindable"
-		);
-		self::assertTrue(
-			method_exists($outputTo, "bindList"),
-			"Template container element (dl) is not bindable"
-		);
-	}
-
-	public function testBindMethodOnTemplateElement() {
-		$document = new HTMLDocument(Helper::HTML_TEMPLATES);
-		$document->extractTemplates();
-		$template = $document->getTemplate("title-definition");
-
-		self::assertTrue(
-			method_exists($template, "bindKeyValue"),
-			"Template element is not bindable"
-		);
-		self::assertTrue(
-			method_exists($template, "bindData"),
-			"Template element is not bindable"
-		);
-		self::assertTrue(
-			method_exists($template, "bindList"),
-			"Template element is not bindable"
-		);
-	}
-
-	public function testBindKeyValueExistingElements() {
-		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES);
-		$name = "Winston Smith";
-		$age = 39;
-		$document->bindKeyValue("name", $name);
-		$document->bindKeyValue("age", $age);
-
-		$boundDataTestElement = $document->querySelector(".bound-data-test");
-		$spanChildren = $boundDataTestElement->querySelectorAll("span");
-		self::assertEquals($name, $spanChildren[0]->innerText);
-		self::assertEquals($age, $spanChildren[1]->innerText);
-	}
-
-	public function testBindValue() {
-		$document = new HTMLDocument(Helper::HTML_KEYLESS_BIND_ATTRIBUTE);
-		$document->bindValue("PHPUnit");
-		$h1 = $document->querySelector("h1");
-		self::assertStringContainsString("Welcome, PHPUnit", $h1->innerText);
-	}
-
-	public function testBindValueOnActualElement() {
-		$document = new HTMLDocument(Helper::HTML_KEYLESS_BIND_ATTRIBUTE);
-		$h1 = $document->querySelector("h1");
-		$h1->bindValue("PHPUnit");
-		self::assertStringContainsString("Welcome, PHPUnit", $h1->innerText);
-	}
-
-	public function testBindDataExistingElements() {
-		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES);
-		$name = "Winston Smith";
-		$age = 39;
-		$document->bindData([
-			"name" => $name,
-			"age" => $age,
-		]);
-
-		$boundDataTestElement = $document->querySelector(".bound-data-test");
-		$spanChildren = $boundDataTestElement->querySelectorAll("span");
-		self::assertEquals($name,$spanChildren[0]->innerText);
-		self::assertEquals($age,$spanChildren[1]->innerText);
-	}
-
-	public function testBindDataOnUnknownProperty() {
-		$document = new HTMLDocument(Helper::HTML_BIND_UNKNOWN_PROPERTY);
-		$name = "Winston Smith";
-		$age = 39;
-		$document->bindData([
-			"name" => $name,
-			"age" => $age,
-		]);
-
-		$test1 = $document->querySelector(".test1");
-		$test2 = $document->querySelector(".test2");
-
-		self::assertEquals($name, $test1->getAttribute("unknown"));
-		self::assertEquals($age, $test2->textContent);
-	}
-
-	public function testBindDataAttributeLookup() {
-		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES_BIND_ATTR);
-		$name = "Julia Dixon";
-		$age = 26;
-		$document->bindData([
-			"name" => $name,
-			"age" => $age,
-		]);
-
-		$boundDataTestElement = $document->querySelector(".bound-data-test");
-		$spanChildren = $boundDataTestElement->querySelectorAll("span");
-		self::assertEquals($name,$spanChildren[0]->innerText);
-		self::assertEquals($age,$spanChildren[1]->innerText);
-	}
-
-	public function testBindDataAttributeNoMatch() {
-		self::expectException(BoundAttributeDoesNotExistException::class);
-		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES_BIND_ATTR);
-		$name = "Julia Dixon";
-		$age = 26;
-		$document->querySelector("[name=person_id]")->setAttribute(
-			"data-bind:text",
-			"@does-not-exist"
-		);
-		$document->bindData([
-			"name" => $name,
-			"age" => $age,
-		]);
-	}
-
-	public function testBindDataNoMatch() {
-		self::expectException(BoundDataNotSetException::class);
-		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES);
-		$name = "Julia Dixon";
-		$age = 26;
-		$document->querySelector("span")->setAttribute(
-			"data-bind:text",
-			"nothing"
-		);
-		$document->bindData([
-			"name" => $name,
-			"age" => $age,
-		]);
-
-		$document->validateBinds();
-	}
-
-	public function testBindDataRemoved() {
-		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES);
-		$name = "Julia Dixon";
-		$age = 26;
-		$document->querySelector("span")->setAttribute(
-			"data-bind:text",
-			"nothing"
-		);
-		$document->bindData([
-			"name" => $name,
-			"age" => $age,
-		]);
-
-		$document->removeTemplateAttributes();
-
-		$boundDataTestElement = $document->querySelector(".bound-data-test");
-		$spanChildren = $boundDataTestElement->querySelectorAll("span");
-		self::assertFalse($spanChildren[0]->hasAttribute("data-bind:text"));
-		self::assertFalse($spanChildren[1]->hasAttribute("data-bind:text"));
-	}
-
-	public function testBoolBindDataRemoved() {
-		$list = [
-			[
-				"label" => "Your name",
-				"name" => "your-name",
-				"placeholder" => "e.g. Julia Dixon",
-				"required" => true,
-			],
-			[
-				"label" => "Your email",
-				"name" => "email",
-				"placeholder" => "e.g. julia@oceana.com",
-				"required" => true,
-			],
-			[
-				"label" => "Age",
-				"name" => "age",
-				"placeholder" => "e.g. 23",
-				"required" => false,
-			],
-		];
-
-		$document = new HTMLDocument(Helper::HTML_DYNAMIC_FORM);
-		$document->extractTemplates();
-		$form = $document->forms[0];
-		$form->bindList($list);
-		$document->removeTemplateAttributes();
-
-		foreach($document->querySelectorAll("label") as $label) {
-			$span = $label->querySelector("span");
-			$input = $label->querySelector("input");
-			self::assertFalse($span->hasAttribute("data-bind:text"));
-			self::assertFalse($input->hasAttribute("data-bind-attributes"));
-			self::assertFalse($input->hasAttribute("data-bind:required"));
-			self::assertFalse($input->hasAttribute("data-bind:placeholder"));
-		}
-	}
-
-	public function testBindDataIndexedArray() {
-		self::expectException(IncompatibleBindDataException::class);
-		$document = new HTMLDocument();
-		$document->bindData(["one", "two", "three"]);
-	}
-
-	public function testInjectAttributePlaceholderNoDataBindAttributes() {
-		$document = new HTMLDocument(Helper::HTML_ATTRIBUTE_PLACEHOLDERS_NO_BIND);
-		$userId = 101;
-		$username = "thoughtpolice";
-		$link = $document->querySelector("a");
-		$img = $document->querySelector("img");
-		$originalHref = $link->href;
-		$originalSrc = $img->src;
-		$originalAlt = $img->alt;
-
-		$document->bindKeyValue("userId", $userId);
-		$document->bindKeyValue("username", $username);
-
-		self::assertEquals($originalHref, $link->href);
-		self::assertEquals($originalSrc, $img->src);
-		self::assertEquals($originalAlt, $img->alt);
-	}
-
-	public function testBindAttributesPlaceholder() {
-		$document = new HTMLDocument(Helper::HTML_ATTRIBUTE_PLACEHOLDERS_NO_BIND);
-		$userId = 101;
-		$username = "thoughtpolice";
-		$link = $document->querySelector("a");
-		$img = $document->querySelector("img");
-		$link->setAttribute("data-bind-attributes", true);
-		$img->setAttribute("data-bind-attributes", true);
-
-		$document->bindKeyValue("userId", $userId);
-		$document->bindKeyValue("username", $username);
-
-		self::assertEquals("/user/101", $link->href);
-		self::assertEquals("/img/profile/$userId.jpg", $img->src);
-		self::assertEquals("thoughtpolice's profile picture", $img->alt);
-	}
-
-	public function testBindAttributesMultiple() {
-		$document = new HTMLDocument(Helper::HTML_ATTRIBUTE_PLACEHOLDERS_NO_BIND);
-		$userId = 101;
-		$userType = "thinkpol";
-		$h1 = $document->querySelector("h1");
-		$h1->setAttribute("data-bind-attributes", true);
-		$document->bindKeyValue("userId", $userId);
-		$document->bindKeyValue("userType", $userType);
-
-		self::assertEquals("heading-thinkpol-101", $h1->id);
-	}
-
-	public function testBindAttributesMultipleInHref() {
-		$document = new HTMLDocument(Helper::HTML_ATTRIBUTE_PLACEHOLDERS_NO_BIND);
-		$userId = 101;
-		$userType = "thinkpol";
-		$footer = $document->querySelector("footer");
-
-		$link = $footer->querySelector("a");
-		$link->setAttribute("data-bind-attributes", true);
-		$footer->bindKeyValue("userId", $userId);
-		self::assertNotNull($link->href);
-		$footer->bindKeyValue("userType", $userType);
-		self::assertNotNull($link->href);
-		self::assertEquals(
-			"/user.php?id=101&type=thinkpol",
-			$link->href
-		);
-	}
-
-	public function testBindClass() {
-		$document = new HTMLDocument(Helper::HTML_TODO_LIST_BIND_CLASS);
-		$isComplete = true;
-
-		$li = $document->querySelector(".existing-class");
-		$todoListElement = $document->getElementById("todo-list");
-		$todoListElement->bindKeyValue(
-			"complete",
-			$isComplete ? "task-complete" : "task-to-do"
-		);
-
-		$classList = $li->classList;
-		self::assertTrue($classList->contains("existing-class"));
-		self::assertTrue($classList->contains("task-complete"));
-
-// If there is already a class on the element, binding to it again will remove it.
-		$todoListElement->bindKeyValue(
-			"complete",
-			$isComplete ? "task-complete" : "task-to-do"
-		);
-		self::assertFalse($classList->contains("task-complete"));
-	}
-
-	public function testBindObjectValue() {
-		$dataObj = new StdClass();
-		$dataObj->name = "Test name";
-		$dataObj->age = 123;
-
-		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES);
-		$document->bindData($dataObj);
-
-		$spans = $document->querySelectorAll(".bound-data-test span");
-		self::assertEquals($dataObj->name, $spans[0]->innerText);
-		self::assertEquals($dataObj->age, $spans[1]->innerText);
-	}
-
-	public function testBindObjectValueParameter() {
-		$dataObj = new StdClass();
-		$dataObj->userId = 123;
-		$dataObj->username = "Testname";
-
-		$document = new HTMLDocument(Helper::HTML_ATTRIBUTE_PLACEHOLDERS);
-		$document->bindData($dataObj);
-
-		$img = $document->querySelector("img");
-		self::assertStringContainsString(
-			"{$dataObj->userId}.jpg",
-			$img->src
-		);
-		self::assertEquals(
-			"{$dataObj->username}'s profile picture",
-			$img->alt
-		);
-	}
-
-	public function testBindListMultipleDataTemplateElementsNoName() {
-		$document = new HTMLDocument(Helper::HTML_DOUBLE_NAMELESS_BIND_LIST);
-		$document->extractTemplates();
-// This will fail, because I am not passing a template name to bind to, and there
-// are more than one nameless template elements in the document.
-// Instead, I should either pass a template name, or bind to a more specific element,
-// such as the UL itself.
-		self::expectException(NamelessTemplateSpecificityException::class);
-// No need for any actual data during this test.
-		$document->bindList([[]]);
-	}
-
-	public function testBindListMultipleDataTemplateElementsWithName() {
-		$document = new HTMLDocument(Helper::HTML_DOUBLE_NAMES_BIND_LIST);
-		$document->extractTemplates();
-		$stateList = [
-			(object)["state-name" => "Oceania", "ideology" => "Ingsoc", "main-territory" => "Western Hemisphere"],
-			(object)["state-name" => "Eurasia", "ideology" => "Neo-Bolshevism", "main-territory" => "Continental Europe"],
-			(object)["state-name" => "Eastasia", "ideology" => "Death Worship", "main-territory" => "China"],
-		];
-		$ministryList = [
-			(object)["ministry-name" => "Peace", "ministry-id" => 123],
-			(object)["ministry-name" => "Plenty", "ministry-id" => 511],
-			(object)["ministry-name" => "Truth", "ministry-id" => 141],
-			(object)["ministry-name" => "Love", "ministry-id" => 610],
-		];
-
-		$firstList = $document->getElementById("list-1");
-		$secondList = $document->getElementById("list-2");
-
-// Note that the difference here to the test above and below this one is that
-// we're actually passing a template name, even though we're still binding to
-// the root document node.
-		$document->bindList($stateList, "state");
-		$document->bindList($ministryList, "ministry");
-
-		self::assertCount(count($stateList), $firstList->children);
-		self::assertCount(count($ministryList), $secondList->children);
-
-		self::assertEquals(
-			$stateList[1]->{"state-name"},
-			$firstList->querySelectorAll("li")[1]->innerText
-		);
-		self::assertEquals(
-			$ministryList[2]->{"ministry-name"},
-			$secondList->querySelectorAll("li")[2]->innerText
-		);
-	}
-
-	public function testBindListMultipleDataTemplateElements() {
-		$document = new HTMLDocument(Helper::HTML_DOUBLE_NAMELESS_BIND_LIST);
-		$document->extractTemplates();
-		$stateList = [
-			(object)["state-name" => "Oceania", "ideology" => "Ingsoc", "main-territory" => "Western Hemisphere"],
-			(object)["state-name" => "Eurasia", "ideology" => "Neo-Bolshevism", "main-territory" => "Continental Europe"],
-			(object)["state-name" => "Eastasia", "ideology" => "Death Worship", "main-territory" => "China"],
-		];
-		$ministryList = [
-			(object)["ministry-name" => "Peace", "ministry-id" => 123],
-			(object)["ministry-name" => "Plenty", "ministry-id" => 511],
-			(object)["ministry-name" => "Truth", "ministry-id" => 141],
-			(object)["ministry-name" => "Love", "ministry-id" => 610],
-		];
-
-		$firstList = $document->getElementById("list-1");
-		$secondList = $document->getElementById("list-2");
-
-		$secondList->bindList($ministryList);
-		$firstList->bindList($stateList);
-
-		self::assertCount(count($stateList), $firstList->children);
-		self::assertCount(count($ministryList), $secondList->children);
-
-		self::assertEquals(
-			$stateList[1]->{"state-name"},
-			$firstList->querySelectorAll("li")[1]->innerText
-		);
-		self::assertEquals(
-			$ministryList[2]->{"ministry-name"},
-			$secondList->querySelectorAll("li")[2]->innerText
-		);
-	}
-
-	public function testBindListAttributeWithNoValue() {
-		$document = new HTMLDocument(Helper::HTML_SELECT);
-		$document->extractTemplates();
-		$sut = $document->getElementById("sut");
-		$data = [];
-
-		$numberText = ["zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"];
-
-		for($i = 0; $i < 10; $i++) {
-			$row = (object)[
-				"text" => $numberText[$i],
-				"value" => $i,
-				"isDisabled" => (bool)($i % 2),
-			];
-
-			if($i === 5) {
-				$row->{"isDisabled"} = true;
-			}
-
-			$data []= $row;
-		}
-
-		$sut->bindList($data);
-
-		foreach($sut->querySelectorAll("option") as $i => $option) {
-			$shouldBeDisabled = (bool)($i % 2);
-			if($i === 5) {
-				$shouldBeDisabled = true;
-			}
-
-			$text = $option->innerText;
-			$value = $option->value;
-
-			if($shouldBeDisabled) {
-				self::assertTrue(
-					$option->hasAttribute("disabled"),
-					"Option should have 'disabled' attribute"
-				);
-			}
-			else {
-				self::assertFalse(
-					$option->hasAttribute("disabled"),
-					"Option should not have 'disabled' attribute"
-				);
-			}
-
-			$expectedText = $numberText[$i];
-			self::assertEquals($expectedText, $text);
-			self::assertEquals($i, $value);
-		}
-	}
-
-	public function testBindValueManualTemplate() {
-		$employeeData = [
-			"Alan Statham" => (object)[
-				"id" => 1742,
-				"title" => "Consultant Radiologist",
-			],
-			"Caroline Todd" => (object)[
-				"id" => 3010,
-				"title" => "Surgical Registrar",
-			],
-			"Guy Secretan" => (object)[
-				"id" => 2019,
-				"title" => "Anaesthetist",
-			],
-			"Karen Ball" => (object)[
-				"id" => 836,
-				"title" => "Human Resources",
-			],
-		];
-
-		$document = new HTMLDocument(Helper::HTML_KEYLESS_BIND_ATTRIBUTE_TEMPLATE_NAMED);
-		$document->extractTemplates();
-
-		foreach($employeeData as $name => $data) {
-			$t = $document->getTemplate("employee-template");
-			$t->bindValue($name);
-			$t->insertTemplate();
-		}
-
-		self::assertCount(
-			count($employeeData),
-			$document->querySelector("ul")->children
-		);
-
-		$i = 0;
-		foreach($employeeData as $name => $data) {
-			$element = $document->querySelector("ul")->children[$i];
-			self::assertEquals($name, $element->querySelector("h1")->innerText);
-			$i++;
-		}
-	}
-
-	public function testBindListStringKeys() {
-		$employeeData = [
-			"Alan Statham" => (object)[
-				"id" => 1742,
-				"title" => "Consultant Radiologist",
-			],
-			"Caroline Todd" => (object)[
-				"id" => 3010,
-				"title" => "Surgical Registrar",
-			],
-			"Guy Secretan" => (object)[
-				"id" => 2019,
-				"title" => "Anaesthetist",
-			],
-			"Karen Ball" => (object)[
-				"id" => 836,
-				"title" => "Human Resources",
-			],
-		];
-
-		$document = new HTMLDocument(Helper::HTML_KEYLESS_BIND_ATTRIBUTE_TEMPLATE);
-		$document->extractTemplates();
-		$document->bindList($employeeData);
-
-		$empListElement = $document->getElementById("emp-list");
-		self::assertCount(count($employeeData), $empListElement->children);
-
-		$i = 0;
-		foreach($employeeData as $name => $data) {
-			$empElement = $empListElement->children[$i];
-			$h1 = $empElement->querySelector("h1");
-			self::assertEquals($name, $h1->textContent);
-			$i++;
-		}
-	}
-
-	public function testBindNestedList() {
-		$document = new HTMLDocument(Helper::HTML_MUSIC);
-		$document->extractTemplates();
-		$document->bindNestedList(Helper::LIST_MUSIC);
-
-		$ulArtists = $document->querySelector(".artist-list");
-
-		self::assertCount(
-			count(Helper::LIST_MUSIC),
-			$ulArtists->children
-		);
-
-		foreach(Helper::LIST_MUSIC as $artistName => $albumList) {
-			$liArtist = $ulArtists->querySelector("li[data-artist-name=$artistName]");
-			$h2ArtistName = $liArtist->querySelector("h2");
-			self::assertEquals($artistName, trim($h2ArtistName->innerText));
-
-			$ulAlbums = $liArtist->querySelector(".album-list");
-			foreach($albumList as $albumName => $trackList) {
-				$liAlbum = $ulAlbums->querySelector("li[data-album-name=$albumName]");
-				$h3AlbumName = $liAlbum->querySelector("h3");
-				self::assertEquals($albumName, trim($h3AlbumName->innerText));
-
-				$olTracks = $liAlbum->querySelector(".track-list");
-				foreach($trackList as $i => $trackName) {
-					$trackLi = $olTracks->children[$i];
-					self::assertEquals($trackName, trim($trackLi->innerText));
-				}
-			}
-		}
-	}
-
-	public function testBindNestedListWithinObject() {
-		$document = new HTMLDocument(Helper::HTML_SHOP);
-		$document->extractTemplates();
-		$data = Helper::LIST_SHOP;
-		foreach($data as $key => $value) {
-			$data[$key] = (object)$value;
-		}
-		$document->bindNestedList($data);
-
-		$ulProductList = $document->querySelector(".product-list");
-		self::assertCount(
-			count($data),
-			$ulProductList->children
-		);
-
-		$index = 0;
-		foreach($data as $itemName => $itemData) {
-			$liProduct = $ulProductList->children[$index];
-
-			self::assertEquals(
-				$itemName,
-				$liProduct->querySelector("h2")->innerText
-			);
-			self::assertEquals(
-				$itemData->{"description"},
-				$liProduct->querySelector("p")->innerText
-			);
-			self::assertEquals(
-				$itemData->{"price"},
-				$liProduct->querySelector(".price")->innerText
-			);
-
-			$ulCategories = $liProduct->querySelector("ul.categories");
-			self::assertCount(
-				count($itemData->{"categories"}),
-				$ulCategories->children
-			);
-
-			foreach($itemData->{"categories"}
-			as $categoryIndex => $categoryName) {
-				$liCategory = $ulCategories->children[$categoryIndex];
-				self::assertEquals($categoryName, trim($liCategory->innerText));
-
-				$link = $liCategory->querySelector("a");
-				self::assertEquals($categoryName, trim($link->innerText));
-				self::assertEquals("/shop/category/$categoryName", $link->href);
-			}
-
-			$index++;
-		}
-	}
-
-	public function testTemplateNameIsAddedWhenNamed() {
-		$document = new HTMLDocument(Helper::HTML_TEMPLATES);
-		$document->extractTemplates();
-
-		foreach(["one", "two", "three"] as $num) {
-			$t = $document->getTemplate("list-item");
-			$t->innerHTML = $num;
-			$inserted = $t->insertTemplate();
-
-			self::assertStringContainsString("t-list-item", $inserted->getAttribute("class"));
-		}
-	}
-
-	public function testTemplateNameIsNotAddedWhenNotNamed() {
-		$document = new HTMLDocument(Helper::HTML_TODO_LIST_INLINE_NAMED_TEMPLATE_DOUBLE);
-		$document->extractTemplates();
-		$unnamedTemplateContainer = $document->getElementById("todo-list-2");
-		$unnamedTemplateContainer->bindList([1, 2, 3]);
-		self::assertCount(3, $unnamedTemplateContainer->children);
-	}
-
-	public function testBindKeyValueBool() {
-		$document = new HTMLDocument(Helper::HTML_TODO_LIST);
-		$document->extractTemplates();
-		$todoIncomplete = new TodoItem(1, "Example not complete", false);
-		$todoComplete = new TodoItem(2, "Example complete", true);
-
-		$document->bindList([
-			$todoIncomplete,
-			$todoComplete,
-		]);
-
-		$listItems = $document->querySelectorAll("li");
-		self::assertFalse($listItems[0]->classList->contains("completed"));
-		self::assertTrue($listItems[1]->classList->contains("completed"));
-	}
-
-	public function testBindListEmptySetsInnerHtmlToEmpty() {
-		$document = new HTMLDocument(Helper::HTML_TODO_LIST);
-		$document->extractTemplates();
-		$ul = $document->getElementById("todo-list");
-		$ul->bindList([]);
-		self::assertEquals("", $ul->innerHTML);
-	}
-
-	public function testBindKvpList() {
-		$kvpData = [
-			"Name" => "Alan",
-			"Occupation" => "Cryptanalyst",
-			"Place of work" => "Bletchley Park",
-		];
-
-		$document = new HTMLDocument(Helper::HTML_KVP_LIST);
-		$document->extractTemplates();
-		$ul = $document->getElementById("list");
-		$ul->bindList($kvpData);
-
-		$expectedKeys = array_keys($kvpData);
-		$expectedValues = array_values($kvpData);
-		foreach($ul->querySelectorAll("li") as $i => $li) {
-			$keySpan = $li->querySelector(".key span");
-			$valueSpan = $li->querySelector(".value span");
-
-			self::assertEquals($expectedKeys[$i], $keySpan->textContent);
-			self::assertEquals($expectedValues[$i], $valueSpan->textContent);
-		}
-	}
-
-	public function testBindNames() {
-		$examplePostData = [];
-		$document = new HTMLDocument(Helper::HTML_FORM);
-		foreach($document->querySelectorAll("[name]") as $nameElement) {
-			$examplePostData[$nameElement->name] = uniqid("value-");
-		}
-
-		$document->bindNames($examplePostData);
-
-		foreach($examplePostData as $key => $value) {
-			$element = $document->querySelector("[name='$key']");
-			self::assertEquals($value, $element->value, $element->tagName);
-		}
-	}
-
-	public function testBindArrayObject() {
-		$data = ["one", "two", "three"];
-		$exampleData = new ArrayObject($data);
-		$document = new HTMLDocument(Helper::HTML_VALUE_LIST);
-		$document->extractTemplates();
-		$document->bindList($exampleData);
-		$liList = $document->querySelectorAll("li");
-		self::assertCount(count($data), $liList);
-
-		foreach($liList as $i => $li) {
-			self::assertEquals($data[$i], $li->innerText);
-		}
-	}
-
-	public function testBindArrayObjectArray() {
-		$todoArrayData = [
-			[
-				"completed" => true,
-				"id" => 1,
-				"title" => "Plan everything"
-			],
-			[
-				"completed" => false,
-				"id" => 2,
-				"title" => "Build everything"
-			],
-			[
-				"completed" => false,
-				"id" => 3,
-				"title" => "Profit"
-			],
-		];
-		$todoData = [];
-		foreach($todoArrayData as $arrayDatum) {
-			$todoData []= new ArrayObject($arrayDatum);
-		}
-
-		$document = new HTMLDocument(Helper::HTML_TODO_LIST);
-		$document->extractTemplates();
-		$document->bindList($todoData);
-		$document->removeTemplateAttributes();
-
-		$liList = $document->querySelectorAll("#todo-list>li");
-		self::assertCount(count($todoArrayData), $liList);
-
-		foreach($liList as $i => $li) {
-			$originalTodoData = $todoArrayData[$i];
-			if($originalTodoData["completed"]) {
-				self::assertTrue($li->classList->contains("completed"));
-				self::assertEquals(
-					$li->querySelector("[name=id]")->value,
-					$originalTodoData["id"]
-				);
-				self::assertEquals(
-					$li->querySelector("[name=title]")->value,
-					$originalTodoData["title"]
-				);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/phpunit/CommentIniTest.php b/test/phpunit/CommentIniTest.php
new file mode 100644
index 0000000..26111d1
--- /dev/null
+++ b/test/phpunit/CommentIniTest.php
@@ -0,0 +1,46 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use Gt\DomTemplate\CommentIni;
+use Gt\DomTemplate\CommentIniInvalidDocumentLocationException;
+use Gt\DomTemplate\Test\TestFactory\DocumentTestFactory;
+use PHPUnit\Framework\TestCase;
+
+class CommentIniTest extends TestCase {
+	public function testConstruct_nullWhenNoCommentBlock():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_USER_PROFILE);
+		$sut = new CommentIni($document);
+		self::assertFalse($sut->containsIniData());
+	}
+
+	public function testConstruct_throwsIfCommentBlockNotFirst():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_INCORRECTLY_EXTENDS_PARTIAL_VIEW);
+		self::expectException(CommentIniInvalidDocumentLocationException::class);
+		self::expectExceptionMessage("A Comment INI must only appear as the first node of the HTML.");
+		new CommentIni($document);
+	}
+
+	public function testContainsIniData_emptyIfNoIniData():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_COMMENT_WITHOUT_INI_DATA_PARTIAL_VIEW);
+		$sut = new CommentIni($document);
+		self::assertFalse($sut->containsIniData());
+	}
+
+	public function testGet_noMatchingData():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_EXTENDS_PARTIAL_VIEW);
+		$sut = new CommentIni($document);
+		self::assertNull($sut->get("no-match"));
+	}
+
+	public function testGet():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_EXTENDS_PARTIAL_VIEW);
+		$sut = new CommentIni($document);
+		self::assertEquals("base-page", $sut->get("extends"));
+	}
+
+	public function testGetNested():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_EXTENDS_PARTIAL_VIEW);
+		$sut = new CommentIni($document);
+		self::assertEquals("My website, extended...", $sut->get("vars.title"));
+	}
+}
diff --git a/test/phpunit/ComponentExpanderTest.php b/test/phpunit/ComponentExpanderTest.php
new file mode 100644
index 0000000..c8a7b18
--- /dev/null
+++ b/test/phpunit/ComponentExpanderTest.php
@@ -0,0 +1,49 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use Gt\DomTemplate\ComponentExpander;
+use Gt\DomTemplate\ModularContent;
+use Gt\DomTemplate\ModularContentFileNotFoundException;
+use Gt\DomTemplate\Test\TestFactory\DocumentTestFactory;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class ComponentExpanderTest extends ModularContentTestCase {
+	public function testExpand_doesNothingWhenNoMatchingFiles():void {
+		$modularContent = self::mockModularContent("_component");
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_COMPONENT);
+		$sut = new ComponentExpander($document, $modularContent);
+		self::assertEmpty($sut->expand());
+	}
+
+	public function testExpand_returnsArrayOfExpandedElements():void {
+		$html = "<h2>This has been replaced!</h2> <p>If you can read this, your custom element is working!</p>";
+
+		$modularContent = self::mockModularContent(
+			"_component", [
+				"custom-element" => $html
+			]
+		);
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_COMPONENT);
+		$sut = new ComponentExpander($document, $modularContent);
+		$expandedElements = $sut->expand();
+		self::assertCount(1, $expandedElements);
+		self::assertSame("CUSTOM-ELEMENT", $expandedElements[0]->tagName);
+		self::assertSame($html, $expandedElements[0]->innerHTML);
+	}
+
+	public function testExpand_recursive():void {
+		$modularContent = self::mockModularContent(
+			"_component", [
+				"todo-list" => DocumentTestFactory::HTML_TODO_COMPONENT_TODO_LIST,
+				"todo-list-item" => DocumentTestFactory::HTML_TODO_COMPONENT_TODO_LIST_ITEM,
+			]
+		);
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TODO_CUSTOM_ELEMENT);
+		$sut = new ComponentExpander($document, $modularContent);
+		$expandedElements = $sut->expand();
+		self::assertCount(2, $expandedElements);
+		self::assertSame("TODO-LIST", $expandedElements[0]->tagName);
+		self::assertSame("TODO-LIST-ITEM", $expandedElements[1]->tagName);
+	}
+}
diff --git a/test/phpunit/DocumentBinderTest.php b/test/phpunit/DocumentBinderTest.php
new file mode 100644
index 0000000..6f76b2d
--- /dev/null
+++ b/test/phpunit/DocumentBinderTest.php
@@ -0,0 +1,378 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use Gt\Dom\HTMLElement\HTMLButtonElement;
+use Gt\Dom\HTMLElement\HTMLImageElement;
+use Gt\Dom\HTMLElement\HTMLParagraphElement;
+use Gt\Dom\HTMLElement\HTMLTableElement;
+use Gt\Dom\HTMLElement\HTMLTableRowElement;
+use Gt\DomTemplate\DocumentBinder;
+use Gt\DomTemplate\IncompatibleBindDataException;
+use Gt\DomTemplate\InvalidBindPropertyException;
+use Gt\DomTemplate\TableElementNotFoundInContextException;
+use Gt\DomTemplate\Test\TestFactory\DocumentTestFactory;
+use PHPUnit\Framework\TestCase;
+use stdClass;
+
+class DocumentBinderTest extends TestCase {
+	/**
+	 * If the developer forgets to add a bind property (the bit after the
+	 * colon in `data-bind:text`, we should let them know with a friendly
+	 * error message.
+	 */
+	public function testBindValue_missingBindProperty():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_NO_BIND_PROPERTY);
+		$sut = new DocumentBinder($document);
+		self::expectException(InvalidBindPropertyException::class);
+		self::expectExceptionMessage("<output> Element has a data-bind attribute with missing bind property - did you mean `data-bind:text`?");
+		$sut->bindValue("Test!");
+	}
+
+	public function testBindValue_singleElement():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_SINGLE_ELEMENT);
+		$sut = new DocumentBinder($document);
+		$output = $document->querySelector("output");
+		self::assertSame("Nothing is bound", $output->textContent);
+		$sut->bindValue("Test!");
+		self::assertSame("Test!", $output->textContent);
+	}
+
+	public function testBindValue_multipleElements():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_MULTIPLE_ELEMENTS);
+		$sut = new DocumentBinder($document);
+		$output1 = $document->getElementById("o1");
+		$output2 = $document->getElementById("o2");
+		$output3 = $document->getElementById("o3");
+		$sut->bindValue("Test!");
+		self::assertSame("Test!", $output1->textContent);
+		self::assertSame("Test!", $output2->textContent);
+		self::assertSame("Test!", $output3->textContent);
+	}
+
+	public function testBindValue_multipleNestedElements():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_MULTIPLE_NESTED_ELEMENTS);
+		$sut = new DocumentBinder($document);
+		$container1 = $document->getElementById("container1");
+		$container2 = $document->getElementById("container2");
+		$sut->bindValue("Test!", $container1);
+
+		foreach($container1->querySelectorAll("output") as $output) {
+			self::assertSame("Test!", $output->textContent);
+		}
+		foreach($container2->querySelectorAll("output") as $output) {
+			self::assertNotSame("Test!", $output->textContent);
+		}
+
+		$sut->bindValue("Test!", $container2);
+		foreach($container1->querySelectorAll("output") as $output) {
+			self::assertSame("Test!", $output->textContent);
+		}
+		foreach($container2->querySelectorAll("output") as $output) {
+			self::assertSame("Test!", $output->textContent);
+		}
+	}
+
+	public function testBindValue_multipleNestedElements_skipsElementWithBindProperty():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_MULTIPLE_NESTED_ELEMENTS);
+		$sut = new DocumentBinder($document);
+		$container3 = $document->getElementById("container3");
+		$sut->bindValue("Test!", $container3);
+		self::assertSame("Default title", $document->querySelector("#container3 h1")->textContent);
+		self::assertSame("Test!", $document->getElementById("o7")->textContent);
+	}
+
+	public function testBindValue_synonymousProperties():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_SYNONYMOUS_BIND_PROPERTIES);
+		$sut = new DocumentBinder($document);
+		$sut->bindValue("updated <b>bold</b>");
+
+		self::assertSame("updated &lt;b&gt;bold&lt;/b&gt;", $document->getElementById("o1")->innerHTML);
+		self::assertSame("updated &lt;b&gt;bold&lt;/b&gt;", $document->getElementById("o2")->innerHTML);
+		self::assertSame("updated &lt;b&gt;bold&lt;/b&gt;", $document->getElementById("o3")->innerHTML);
+		self::assertSame("updated &lt;b&gt;bold&lt;/b&gt;", $document->getElementById("o4")->innerHTML);
+		self::assertSame("updated &lt;b&gt;bold&lt;/b&gt;", $document->getElementById("o5")->innerHTML);
+		self::assertSame("updated <b>bold</b>", $document->getElementById("o6")->innerHTML);
+		self::assertSame("updated <b>bold</b>", $document->getElementById("o7")->innerHTML);
+		self::assertSame("updated <b>bold</b>", $document->getElementById("o8")->innerHTML);
+		self::assertSame("updated <b>bold</b>", $document->getElementById("o9")->innerHTML);
+	}
+
+	public function testBindKeyValue_noMatches():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_SINGLE_ELEMENT);
+		$sut = new DocumentBinder($document);
+		$sut->bindKeyValue("missing", "example");
+		self::assertSame("Nothing is bound", $document->querySelector("output")->innerHTML);
+	}
+
+	public function testBindKeyValue_noMatchesInDifferentHierarchy():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_MULTIPLE_NESTED_ELEMENTS);
+		$sut = new DocumentBinder($document);
+// The "title" bind element is actually within the #c3 hierarchy so should not be bound.
+		$sut->bindKeyValue("title", "This should not bind", $document->getElementById("container1"));
+		self::assertSame("Default title", $document->querySelector("#container3 h1")->textContent);
+	}
+
+	public function testBindKeyValue():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_MULTIPLE_NESTED_ELEMENTS);
+		$sut = new DocumentBinder($document);
+		$sut->bindKeyValue("title", "This should bind");
+		self::assertSame("This should bind", $document->querySelector("#container3 h1")->textContent);
+		self::assertSame("This should bind", $document->querySelector("#container3 p span")->textContent);
+	}
+
+	public function testBindData_assocArray():void {
+		$username = uniqid("user");
+		$email = uniqid() . "@example.com";
+		$category = uniqid("category-");
+
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_USER_PROFILE);
+		$sut = new DocumentBinder($document);
+		$sut->bindData([
+			"username" => $username,
+			"email" => $email,
+			"category" => $category,
+		]);
+
+		self::assertSame($username, $document->getElementById("dd1")->textContent);
+		self::assertSame($email, $document->getElementById("dd2")->textContent);
+		self::assertSame($category, $document->getElementById("dd3")->textContent);
+	}
+
+	public function testBindData_indexedArray():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_USER_PROFILE);
+		$sut = new DocumentBinder($document);
+		self::expectException(IncompatibleBindDataException::class);
+		self::expectExceptionMessage("bindData is only compatible with key-value-pair data, but it was passed an indexed array.");
+		$sut->bindData(["one", "two", "three"]);
+	}
+
+	public function testBindData_object():void {
+		$userObject = new StdClass();
+		$userObject->username = "g105b";
+		$userObject->email = "greg.bowler@g105b.com";
+		$userObject->category = "maintainer";
+
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_USER_PROFILE);
+		$sut = new DocumentBinder($document);
+		$sut->bindData($userObject);
+
+		self::assertSame($userObject->username, $document->getElementById("dd1")->textContent);
+		self::assertSame($userObject->email, $document->getElementById("dd2")->textContent);
+		self::assertSame($userObject->category, $document->getElementById("dd3")->textContent);
+	}
+
+	public function testBindData_indexArray_shouldThrowException():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_USER_PROFILE);
+		$sut = new DocumentBinder($document);
+		self::expectException(IncompatibleBindDataException::class);
+		self::expectExceptionMessage("bindData is only compatible with key-value-pair data, but it was passed an indexed array.");
+		$sut->bindData(["one", "two", "three"]);
+	}
+
+	public function testBindData_outOfContext():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_USER_PROFILE);
+		$sut = new DocumentBinder($document);
+		$sut->bindData([
+			"username" => "will-not-bind",
+			"email" => "will-not-bind",
+			"category" => "will-not-bind",
+		], $document->getElementById("audit-trail"));
+
+		self::assertNotSame("will-not-bind", $document->getElementById("dd1")->textContent);
+		self::assertNotSame("will-not-bind", $document->getElementById("dd2")->textContent);
+		self::assertNotSame("will-not-bind", $document->getElementById("dd3")->textContent);
+	}
+
+	public function testBindKeyValue_arbitraryAttributes():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_DIFFERENT_BIND_PROPERTIES);
+		$sut = new DocumentBinder($document);
+		/** @var HTMLImageElement $img */
+		$img = $document->getElementById("img1");
+
+		$sut->bindKeyValue("photoURL", "/cat.jpg");
+		self::assertSame("/cat.jpg", $img->src);
+
+		$sut->bindKeyValue("altText", "My cat");
+		self::assertSame("My cat", $img->alt);
+	}
+
+	public function testBindKeyValue_classAttribute():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_DIFFERENT_BIND_PROPERTIES);
+		$sut = new DocumentBinder($document);
+
+		/** @var HTMLImageElement $img */
+		$img = $document->getElementById("img1");
+
+		self::assertSame("main", $img->className);
+		$sut->bindKeyValue("size", "large");
+		self::assertSame("main large", $img->className);
+		$sut->bindKeyValue("size", "large");
+		self::assertSame("main large", $img->className);
+	}
+
+	public function testBindKeyValue_classToggle():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_DIFFERENT_BIND_PROPERTIES);
+		$sut = new DocumentBinder($document);
+
+		/** @var HTMLImageElement $img */
+		$img = $document->getElementById("img2");
+
+		self::assertSame("secondary", $img->className);
+		$sut->bindKeyValue("is-selected", true, $img);
+		self::assertSame("secondary is-selected", $img->className);
+		$sut->bindKeyValue("is-selected", false, $img);
+		self::assertSame("secondary", $img->className);
+	}
+
+	public function testBindKeyValue_classToggle_differentClassNameToBindKey():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_DIFFERENT_BIND_PROPERTIES);
+		$sut = new DocumentBinder($document);
+
+		/** @var HTMLImageElement $img */
+		$img = $document->getElementById("img3");
+
+		self::assertSame("secondary", $img->className);
+		$sut->bindKeyValue("isSelected", true, $img);
+		self::assertSame("secondary selected-image", $img->className);
+		$sut->bindKeyValue("isSelected", false, $img);
+		self::assertSame("secondary", $img->className);
+	}
+
+	public function testBindKeyValue_toggleArbitraryAttribute():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_DIFFERENT_BIND_PROPERTIES);
+		$sut = new DocumentBinder($document);
+
+		/** @var HTMLParagraphElement $paragraph */
+		$paragraph = $document->getElementById("p1");
+
+		self::assertSame("funny friendly", $paragraph->dataset->params);
+		$sut->bindKeyValue("isMagic", false, $paragraph);
+		self::assertSame("funny friendly", $paragraph->dataset->params);
+		$sut->bindKeyValue("isMagic", true, $paragraph);
+		self::assertSame("funny friendly magical", $paragraph->dataset->params);
+		$sut->bindKeyValue("isMagic", false, $paragraph);
+		self::assertSame("funny friendly", $paragraph->dataset->params);
+	}
+
+	/**
+	 * This tests the `data-bind:disabled="?isDisabled" functionality. The
+	 * question mark at the start of the bind parameter indicates that the
+	 * bind attribute will be toggled depending on a bound boolean value.
+	 */
+	public function testBindKeyValue_toggleDisabled():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_DIFFERENT_BIND_PROPERTIES);
+		$sut = new DocumentBinder($document);
+
+		/** @var HTMLButtonElement $button */
+		$button = $document->getElementById("btn1");
+
+		self::assertFalse($button->disabled);
+		$sut->bindKeyValue("isBtn1Disabled", true);
+		self::assertTrue($button->disabled);
+		$sut->bindKeyValue("isBtn1Disabled", false);
+		self::assertFalse($button->disabled);
+	}
+
+	/**
+	 * This tests the inverse logic of the above test. The bind parameter
+	 * is prefixed with a question mark AND an exclamation mark, meaning to
+	 * use the inverse of what is passed. This makes sense for the
+	 * "disabled" attribute, because it is likely that the data represents
+	 * whether the element should be enabled (but there's no "enabled"
+	 * HTML attribute).
+	 */
+	public function testBindKeyValue_toggleDisabled_inverseLogic():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_DIFFERENT_BIND_PROPERTIES);
+		$sut = new DocumentBinder($document);
+
+		/** @var HTMLButtonElement $button */
+		$button = $document->getElementById("btn2");
+
+		self::assertFalse($button->disabled);
+		$sut->bindKeyValue("isBtn2Enabled", false);
+		self::assertTrue($button->disabled);
+		$sut->bindKeyValue("isBtn2Enabled", true);
+		self::assertFalse($button->disabled);
+	}
+
+	public function testBindKeyValue_tableData_noTable():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_NO_TABLE);
+		$sut = new DocumentBinder($document);
+		self::expectException(TableElementNotFoundInContextException::class);
+		$sut->bindKeyValue("tableData", []);
+	}
+
+	public function testBindTable():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLES);
+		$sut = new DocumentBinder($document);
+
+		$tableData = [
+			["Name", "Position"],
+			["Alan Statham", "Head of Radiology"],
+			["Sue White", "Staff Liason Officer"],
+			["Mac Macartney", "General Surgeon"],
+			["Joanna Clore", "HR"],
+			["Caroline Todd", "Surgical Registrar"],
+		];
+
+		/** @var HTMLTableElement $table */
+		$table = $document->getElementById("tbl1");
+		$sut->bindTable($tableData, $table);
+
+		foreach($tableData as $rowIndex => $rowData) {
+			/** @var HTMLTableRowElement $row */
+			$row = $table->rows[$rowIndex];
+
+			foreach($rowData as $cellIndex => $cellValue) {
+				self::assertSame(
+					$cellValue,
+					$row->cells[$cellIndex]->textContent
+				);
+			}
+		}
+	}
+
+	public function testBindKeyValue_tableData():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLES);
+		$sut = new DocumentBinder($document);
+
+		$tableData = [
+			["Name", "Position"],
+			["Alan Statham", "Head of Radiology"],
+			["Sue White", "Staff Liason Officer"],
+			["Mac Macartney", "General Surgeon"],
+			["Joanna Clore", "HR"],
+			["Caroline Todd", "Surgical Registrar"],
+		];
+
+		/** @var HTMLTableElement $table */
+		$table = $document->getElementById("tbl1");
+		$sut->bindKeyValue("tableData", $tableData, $table);
+
+		foreach($tableData as $rowIndex => $rowData) {
+			/** @var HTMLTableRowElement $row */
+			$row = $table->rows[$rowIndex];
+
+			foreach($rowData as $cellIndex => $cellValue) {
+				self::assertSame(
+					$cellValue,
+					$row->cells[$cellIndex]->textContent
+				);
+			}
+		}
+	}
+
+	public function testBindList():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_LIST_TEMPLATE);
+		$sut = new DocumentBinder($document);
+
+		$listData = ["One", "Two", "Three"];
+		$sut->bindList($listData);
+
+		$liElementList = $document->querySelectorAll("ul li");
+
+		foreach($listData as $i => $listItem) {
+			self::assertSame($listItem, $liElementList[$i]->textContent);
+		}
+	}
+}
diff --git a/test/phpunit/DocumentTest.php b/test/phpunit/DocumentTest.php
deleted file mode 100644
index 9be4583..0000000
--- a/test/phpunit/DocumentTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-namespace Gt\DomTemplate\Test;
-
-use DOMDocument;
-use Gt\DomTemplate\Document;
-use Gt\DomTemplate\DocumentFragment;
-use Gt\DomTemplate\Element;
-
-class DocumentTest extends TestCase {
-	public function testOverriddenClasses() {
-		$document = new Document();
-		self::assertInstanceOf(DOMDocument::class, $document);
-
-		$document->loadHTML("<!doctype html><h1>Test</h1>");
-		self::assertInstanceOf(Element::class, $document->firstElementChild);
-
-		$fragment = $document->createDocumentFragment();
-		self::assertInstanceOf(DocumentFragment::class, $fragment);
-	}
-}
\ No newline at end of file
diff --git a/test/phpunit/HTMLAttributeBinderTest.php b/test/phpunit/HTMLAttributeBinderTest.php
new file mode 100644
index 0000000..ee760fb
--- /dev/null
+++ b/test/phpunit/HTMLAttributeBinderTest.php
@@ -0,0 +1,15 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use Gt\DomTemplate\HTMLAttributeBinder;
+use Gt\DomTemplate\Test\TestFactory\DocumentTestFactory;
+use PHPUnit\Framework\TestCase;
+
+class HTMLAttributeBinderTest extends TestCase {
+	public function testBind_wholeDocument():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_LANGUAGE);
+		$sut = new HTMLAttributeBinder();
+		$sut->bind("language", "en_GB", $document);
+		self::assertSame("en_GB", $document->documentElement->getAttribute("lang"));
+	}
+}
diff --git a/test/phpunit/HTMLDocumentTest.php b/test/phpunit/HTMLDocumentTest.php
deleted file mode 100644
index 022428b..0000000
--- a/test/phpunit/HTMLDocumentTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-namespace Gt\DomTemplate\Test;
-
-use Gt\DomTemplate\DocumentFragment;
-use Gt\DomTemplate\Element;
-use Gt\DomTemplate\HTMLDocument;
-
-class HTMLDocumentTest extends TestCase {
-	public function testOverriddenClasses() {
-		$document = new HTMLDocument("<!doctype html><h1>Test</h1>");
-		self::assertInstanceOf(Element::class, $document->firstElementChild);
-		$fragment = $document->createDocumentFragment();
-		self::assertInstanceOf(DocumentFragment::class, $fragment);
-	}
-
-	public function testGetElementById() {
-		$document = new HTMLDocument("<!doctype html><h1 id='test'>Test</h1>");
-		$element = $document->getElementById("test");
-		self::assertInstanceOf(Element::class, $element);
-	}
-}
\ No newline at end of file
diff --git a/test/phpunit/Helper/BindDataGetter/TodoItem.php b/test/phpunit/Helper/BindDataGetter/TodoItem.php
deleted file mode 100644
index cc4078e..0000000
--- a/test/phpunit/Helper/BindDataGetter/TodoItem.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-namespace Gt\DomTemplate\Test\Helper\BindDataGetter;
-
-use Gt\DomTemplate\BindObject;
-
-class TodoItem implements BindObject {
-	private $id;
-	private $title;
-	private $completed;
-
-	public function __construct(
-		int $id,
-		string $title,
-		bool $completed = false
-	) {
-		$this->id = $id;
-		$this->title = $title;
-		$this->completed = $completed;
-	}
-
-	public function getTitle():string {
-		return $this->title;
-	}
-
-
-	public function bindId():int {
-		return $this->id;
-	}
-
-	public function bindTitle():string {
-		return $this->getTitle();
-	}
-
-	public function bindCompleted():bool {
-		return $this->completed;
-	}
-}
\ No newline at end of file
diff --git a/test/phpunit/Helper/Helper.php b/test/phpunit/Helper/Helper.php
deleted file mode 100644
index 4e2298f..0000000
--- a/test/phpunit/Helper/Helper.php
+++ /dev/null
@@ -1,770 +0,0 @@
-<?php
-namespace Gt\DomTemplate\Test\Helper;
-
-class Helper {
-	const HTML_NO_TEMPLATES = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has no templates</title>
-<main>
-	<section>
-		<h1>Hello, World!</h1>
-		<p>
-			Lorem ipsum dolor sit amet, consectetur adipisicing elit. A aliquam animi 
-			deleniti distinctio dolore doloremque, eius et facilis iure maiores nihil 
-			nisi, nostrum optio perferendis perspiciatis, rerum vitae voluptates.
-		</p>
-		<p class="bound-data-test">
-			My name is <span data-bind:text="name">Example</span> 
-			and I am <span data-bind:text="age">0</span> years old. 	
-		</p>
-	</section>
-</main>
-HTML;
-
-	const HTML_NO_TEMPLATES_BIND_ATTR = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has no templates but does have bound attributes</title>
-<main>
-	<section>
-		<h1>Hello, World!</h1>
-		<p>
-			Lorem ipsum dolor sit amet, consectetur adipisicing elit. A aliquam animi 
-			deleniti distinctio dolore doloremque, eius et facilis iure maiores nihil 
-			nisi, nostrum optio perferendis perspiciatis, rerum vitae voluptates.
-		</p>
-		<p class="bound-data-test">
-			My name is <span id="name" name="person_id" data-bind:text="@id">Example</span> 
-			and I am <span name="age" data-bind:text="@name">0</span> years old. 	
-		</p>
-	</section>
-</main>
-HTML;
-
-
-	const HTML_TEMPLATES = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has some templates</title>
-<main>
-	<section>
-		<h1>Hello, World!</h1>
-		<ul>
-			<li data-template="list-item">This is a list item</li>
-		</ul>
-		<p>
-			Above this paragraph is an unordered list, with the LI elements templated.
-		</p>
-		<dl>
-			<template id="title-definition">
-				<dt data-bind:text="title">Title</dt>
-				<dd data-bind:text="definition">Definition</dd>
-			</template>
-		</dl>
-		<p>
-			Above this paragraph is a definition list, with a template element wrapping the elements to extract.
-		</p>
-		<p>
-			Below is an ordered list with the LI elements templated.		
-		</p>
-		<ol>
-			<li data-template="ordered-list-item">This is an item in the second list</li>		
-		</ol>
-	</section>
-</main>
-HTML;
-
-	const HTML_COMPONENTS = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has some components</title>
-<main>
-	<section>
-		<h1>Hello, World!</h1>
-		<ul>
-			<li data-template="list-item">This is a list item</li>
-		</ul>
-		<p>
-			Above this paragraph is an unordered list, with the LI elements templated.
-		</p>
-		
-		<title-definition-list></title-definition-list>
-		
-		<p>
-			Above this paragraph is a custom component, which has a nested component within it.
-		</p>
-		<p>
-			Below is another custom component.		
-		</p>
-		<ordered-list></ordered-list>
-	</section>
-</main>
-HTML;
-
-	const HTML_COMPONENTS_WITH_NAMED_TEMPLATE = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has some components</title>
-<main>
-	<section>
-		<h1>Hello, World!</h1>
-		<ul>
-			<li data-template="list-item">This is a list item</li>
-		</ul>
-		<p>
-			Above this paragraph is an unordered list, with the LI elements templated.
-		</p>
-		
-		<title-definition-list data-template="tdlist"></title-definition-list>
-		
-		<p>
-			Above this paragraph is a custom component, which has a nested component within it.
-		</p>
-		<p>
-			Below is another custom component.		
-		</p>
-		<ordered-list></ordered-list>
-	</section>
-</main>
-HTML;
-
-	const HTML_COMPONENT_WITH_CLASS = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has some components</title>
-<main>
-	<section>
-		<h1>Hello, World!</h1>
-		
-		<title-definition-list class="source-class"></title-definition-list>
-		
-		<p>
-			Above this paragraph is a custom component, which has a nested component within it.
-		</p>
-	</section>
-</main>
-HTML;
-
-	const HTML_COMPONENT_WITH_CLASS_ON_PARENT = <<<HTML
-<li class="existing-class">This is an item in the list</li>
-HTML;
-
-	const HTML_TEMPLATE_WITH_NESTED_COMPONENT = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has a template with a component inside</title>
-<main>
-	<section>
-		<outer-nested-thing></outer-nested-thing>	
-	</section>
-</main>
-HTML;
-
-	const COMPONENT_OUTER_NESTED_THING = <<<HTML
-<ul>
-	<li data-template="inner-template-item">
-		<inner-nested-thing></inner-nested-thing>			
-	</li>		
-</ul>
-HTML;
-
-	const COMPONENT_INNER_NESTED_THING = <<<HTML
-<p>These two paragraphs are contained within a component, within a template!</p>
-<p>The iteration number is: <span class="number">X</span></p>
-HTML;
-
-	const COMPONENT_TITLE_DEFINITION_LIST = <<<HTML
-<dl>
-	<title-definition data-template="title-definition-item"></title-definition>
-</dl>
-HTML;
-
-	const COMPONENT_TITLE_DEFINITION = <<<HTML
-<dt data-template-text="@title">Title</dt>
-<dd data-template-text="@definition">Definition</dd>
-HTML;
-
-	const COMPONENT_ORDERED_LIST = <<<HTML
-<ol>
-	<ordered-list-item></ordered-list-item>		
-</ol>
-HTML;
-	const COMPONENT_ORDERED_LIST_ITEM = <<<HTML
-<li>This is an item in the list</li>
-HTML;
-
-	const COMPONENT_WITH_TEMPLATE = <<<HTML
-<ul>
-	<li data-template data-bind:text>Test</li>
-</ul>
-HTML;
-
-	const HTML_SIMPLE_LIST_COMPONENT = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Simple componentised list test</title>
-<main>
-	<simple-list></simple-list>
-</main>
-HTML;
-
-
-	const HTML_BIND_UNKNOWN_PROPERTY = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has no templates</title>
-<main>
-	<section>
-		<h1>Hello, World!</h1>
-		<p>
-			Lorem ipsum dolor sit amet, consectetur adipisicing elit. A aliquam animi 
-			deleniti distinctio dolore doloremque, eius et facilis iure maiores nihil 
-			nisi, nostrum optio perferendis perspiciatis, rerum vitae voluptates.
-		</p>
-		<p class="bound-data-test">
-			My name is <span class="test1" data-bind:unknown="name">Example</span> 
-			and I am <span class="test2" data-bind:text="age">0</span> years old. 	
-		</p>
-	</section>
-</main>
-HTML;
-
-	const HTML_TODO_LIST = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Todo list</title>
-<main>
-	<ul id="todo-list">
-		<li data-template data-bind:class="completed">
-			<input name="id" data-bind:value="@name" />
-			<input name="title" data-bind:value="@name" />
-			<button name="do" value="complete">Complete</button>		
-		</li>
-	</ul>
-</main>
-HTML;
-
-	const HTML_TODO_LIST_INLINE_NAMED_TEMPLATE = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Todo list</title>
-<main>
-	<ul id="todo-list">
-		<li data-template="todo-list-item">
-			<input name="id" data-bind:value="@name" />
-			<input name="title" data-bind:value="@name" />
-			<button name="do" value="complete">Complete</button>		
-		</li>
-	</ul>
-</main>
-HTML;
-
-	const HTML_TODO_LIST_INLINE_NAMED_TEMPLATE_DOUBLE = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Todo list</title>
-<main>
-	<ul id="todo-list">
-		<li data-template="todo-list-item">
-			<input name="id" data-bind:value="@name" />
-			<input name="title" data-bind:value="@name" />
-			<button name="do" value="complete">Complete</button>		
-		</li>
-	</ul>
-	
-	<ul id="todo-list-2">
-		<li data-template>
-			<p>Use the other template instead!</p>
-		</li>
-	</ul>
-</main>
-HTML;
-
-	const HTML_TODO_LIST_OPTIONAL_ID = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Todo list</title>
-<main>
-	<ul id="todo-list">
-		<li data-template>
-			<input name="id" data-bind:value="?id" />
-			<input name="title" data-bind:value="@name" />
-			<button name="do" value="complete">Complete</button>		
-		</li>
-	</ul>
-</main>
-HTML;
-
-	const HTML_TODO_LIST_OPTIONAL_ID_REFERENCED = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Todo list</title>
-<main>
-	<ul id="todo-list">
-		<li data-template>
-			<input name="id" data-bind:value="?@name" />
-			<input name="title" data-bind:value="@name" />
-			<button name="do" value="complete">Complete</button>		
-		</li>
-	</ul>
-</main>
-HTML;
-
-	const HTML_TODO_LIST_BIND_CLASS = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Todo list</title>
-<main>
-	<ul id="todo-list">
-		<li data-template data-bind:class="complete" class="existing-class">
-			<input name="id" data-bind:value="@name" />
-			<input name="title" data-bind:value="@name" />
-			<button name="do" value="complete">Complete</button>		
-		</li>
-	</ul>
-</main>
-HTML;
-
-	const HTML_TODO_LIST_BIND_CLASS_COLON = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Todo list</title>
-<main>
-	<ul id="todo-list">
-		<li data-template data-bind:class="dateTimeCompleted:complete" class="existing-class">
-			<input name="id" data-bind:value="@name" />
-			<input name="title" data-bind:value="@name" />
-			<button name="do" value="complete">Complete</button>		
-		</li>
-	</ul>
-</main>
-HTML;
-
-	const HTML_TODO_LIST_BIND_CLASS_COLON_MULTIPLE = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Todo list</title>
-<main>
-	<ul id="todo-list">
-		<li data-template data-bind:class="dateTimeCompleted:complete dateTimeDeleted:deleted" class="existing-class">
-			<input name="id" data-bind:value="@name" />
-			<input name="title" data-bind:value="@name" />
-			<button name="do" value="complete">Complete</button>		
-		</li>
-	</ul>
-</main>
-HTML;
-
-	const HTML_NESTED_LIST = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Nested list</title>
-<main>
-	<ul>
-		<li data-template class="outer">
-			<h1 data-bind:text>0:0</h1>
-			
-			<ol>
-				<li data-template class="inner">
-					<h2 data-bind:text>Inner title goes here</h2>				
-				</li>			
-			</ol>		
-		</li>
-	</ul>
-</main>
-HTML;
-
-
-	const HTML_PARENT_HAS_DATA_BIND_ATTR = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has a parent element with a data bind attribute</title>
-<main>
-	<div class="parent">
-		<label>
-			<span data-bind:text="outside-scope">This node is outside the scope</span>
-	
-			<ul>
-				<li data-template="target-template">
-					<span data-bind:text="target-key">This node is the target</a>
-				</li>
-			</ul>
-		</label>
-	</div>
-</main>
-HTML;
-
-	const HTML_DOUBLE_BINDABLE_LIST = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has a two bindable lists and other bindable areas</title>
-<main>
-	<h1>Test document name: <span data-bind:text="name">name goes here</span></h1>
-	
-	<div class="area-1">
-		<p>Here is a list of numbers from 1 to 10:</p>
-		
-		<ul>
-			<li data-template>
-				<span data-bind:text="number">N</span>
-			</li>		
-		</ul>
-	</div>
-	
-	<div class="area-2">
-		<p>Here is another list, starting from <span data-bind:text="start">X</span></p>
-		
-		<ul>
-			<li data-template="dynamic-list-item">
-				<span data-bind:text="number">N</span>
-			</li>		
-		</ul>
-	</div>
-</main>
-HTML;
-
-	const HTML_DOUBLE_NAMELESS_BIND_LIST = <<<HTML
-<!doctype html>
-<main>
-	<h1>List of totalitarian superstates:</h1>
-	<ul id="list-1">
-		<li data-template data-bind:text="state-name"></li> 
-	</ul>
-
-	<h1>Ministries of Oceana:</h1>
-	<ul id="list-2">
-		<li data-template data-bind:text="ministry-name"></li>
-	</ul>
-</main>
-HTML;
-
-	const HTML_DOUBLE_NAMES_BIND_LIST = <<<HTML
-<!doctype html>
-<main>
-	<h1>List of totalitarian superstates:</h1>
-	<ul id="list-1">
-		<li data-template="state" data-bind:text="state-name"></li> 
-	</ul>
-
-	<h1>Ministries of Oceana:</h1>
-	<ul id="list-2">
-		<li data-template="ministry" data-bind:text="ministry-name"></li>
-	</ul>
-</main>
-HTML;
-
-
-	const HTML_ATTRIBUTE_PLACEHOLDERS_NO_BIND = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has some elements with attribute placeholders</title>
-<main>
-	<h1 id="heading-{userType}-{userId}">This is a test!</h1>
-	<p><a id="userType-{userType}" href="/user/{userId}">View your account</a></p>
-	
-	<p>You are logged in.</p>
-	<p>This is your profile picture:</p>
-	
-	<img src="/img/profile/{userId}.jpg" alt="{username}'s profile picture" />
-</main>
-<footer>
-	<a href="/user.php?id={userId}&type={userType}">Another link in the footer</a>
-</footer>
-HTML;
-
-	const HTML_ATTRIBUTE_PLACEHOLDERS = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>This document has some elements with attribute placeholders</title>
-<main>
-	<h1 id="heading-{userType}-{userId}" data-bind-attributes>This is a test!</h1>
-	<p><a id="userType-{userType}" href="/user/{userId}" data-bind-attributes>View your account</a></p>
-	
-	<p>You are logged in.</p>
-	<p>This is your profile picture:</p>
-	
-	<img src="/img/profile/{userId}.jpg" alt="{username}'s profile picture" data-bind-attributes />
-</main>
-<footer>
-	<a href="/user.php?id={userId}&type={userType}" data-bind-attributes>Another link in the footer</a>
-</footer>
-HTML;
-
-	const HTML_MUSIC = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Music list</title>
-<main>
-	<h1>Music list!</h1>
-	
-	<ul class="artist-list">
-		<li data-template data-bind:data-artist-name>
-			<h2 data-bind:text>Artist name</h2>
-			
-			<ul class="album-list">
-				<li data-template data-bind:data-album-name>
-					<h3 data-bind:text>Album name</h3>
-					
-					<ol class="track-list">
-						<li data-template data-bind:data-track-name>
-							<span data-bind:text>Track name</span>						
-						</li>
-					</ol> 				
-				</li>			
-			</ul>		
-		</li>
-	</ul>
-</main>
-HTML;
-
-	const LIST_MUSIC = [
-		"A Band From Your Childhood" => [
-			"This Album is Good" => [
-				"The Best Song You‘ve Ever Heard",
-				"Another Cracking Tune",
-				"Top Notch Music Here",
-				"The Best Is Left ‘Til Last",
-			],
-			"Adequate Collection" => [
-				"Meh",
-				"‘sok",
-				"Sounds Like Every Other Song",
-			],
-		],
-		"Bongo and The Bronks" => [
-			"Salad" => [
-				"Tomatoes",
-				"Song About Cucumber",
-				"Onions Make Me Cry (but I love them)",
-			],
-			"Meat" => [
-				"Steak",
-				"Is Chicken Really a Meat?",
-				"Don‘t Look in the Sausage Factory",
-				"Stop Horsing Around",
-			],
-			"SnaxX" => [
-				"Crispy Potatoes With Salt",
-				"Pretzel Song",
-				"Pork Scratchings Are Skin",
-				"The Peanut Is Not Actually A Nut",
-			],
-		],
-		"Crayons" => [
-			"Pastel Colours" => [
-				"Egg Shell",
-				"Cotton",
-				"Frost",
-				"Periwinkle",
-			],
-			"Different Shades of Blue" => [
-				"Cobalt",
-				"Slate",
-				"Indigo",
-				"Teal",
-			],
-		]
-	];
-
-	const HTML_KVP_LIST = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>KVP list test</title>
-<main>
-	<ul id="list">
-		<li data-template>
-			<p class="key">
-				KEY: <span data-bind:text="_key">Key goes here</span>
-			</p>
-			<p class="value">
-				VALUE: <span data-bind:text>Value goes here</span>			
-			</p>
-		</li>
-	</ul>
-</main>
-HTML;
-
-	const HTML_VALUE_LIST = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>KVP list test</title>
-<main>
-	<ul id="list">
-		<li data-template data-bind:text>VALUE</li>
-	</ul>
-</main>
-HTML;
-
-	const HTML_SHOP = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Online shop</title>
-<main>
-	<h1>Online shop!</h1>
-	
-	<ul class="product-list">
-		<li data-template>
-			<h2 data-bind:text>Product Name</h2>
-			<p data-bind:text="description">Description of product</p>
-			£<span data-bind:text="price" class="price">0.00</span>
-			
-			<h3>Categories:</h3>
-			<ul class="categories">
-				<li data-template>
-					<a href="/shop/category/{}" data-bind:text data-bind-attributes>Category name</a>
-				</li>
-			</ul>
-		</li>
-	</ul>
-HTML;
-
-	const LIST_SHOP = [
-// IMPORTANT: Within the unit test, the outer associative array needs to be
-// converted into an Object, but this can't be done as a CONST.
-		"Handblown Glass Carafe" => [
-			"description" => "The most important part of any brewing system",
-			"price" => 44.95,
-			"categories" => [
-				"coffee",
-				"brew",
-				"glass",
-				"filter",
-			]
-		],
-		"Pre-folded filter papers" => [
-			"description" => "Cone shaped filters to ensure the purest flavour",
-			"price" => 9.00,
-			"categories" => [
-				"coffee",
-				"refill",
-				"filter",
-			]
-		],
-		"Bean Grinder" => [
-			"description" => "Italian-made burr grinder, offering unparallelled performance",
-			"price" => 250,
-			"categories" => [
-				"coffee",
-				"grinding",
-				"accessory",
-			]
-		]
-	];
-
-	const HTML_SELECT = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Select test</title>
-
-<body>
-	<select id="sut">
-		<option data-template data-bind:text="text" data-bind:value="value" data-bind:disabled="?isDisabled">Test</option>
-	</select>
-</body>
-HTML;
-
-	const HTML_KEYLESS_BIND_ATTRIBUTE = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Keyless data-bind attributes</title>
-
-<body>
-	<h1>Welcome, <span data-bind:text>name</span>!</h1>
-</body>
-
-HTML;
-
-	const HTML_KEYLESS_BIND_ATTRIBUTE_TEMPLATE = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Keyless data-bind attributes</title>
-
-<body>
-	Employee list:
-	
-	<ul id="emp-list">
-		<li data-template>
-			<h1 data-bind:text>Employee name</h1>
-			
-			Details:
-			<dl>
-				<dt>ID</dt>
-				<dd data-bind:text="id">000</dd>
-				
-				<dt>Department</dt>
-				<dd data-bind:text="title">JOBTITLE</dd>
-			</dl>
-		</li>
-	</ul>
-</body>
-HTML;
-
-	const HTML_KEYLESS_BIND_ATTRIBUTE_TEMPLATE_NAMED = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Keyless data-bind attributes</title>
-
-<body>
-	Employee list:
-	
-	<ul id="emp-list">
-		<li data-template="employee-template">
-			<h1 data-bind:text>Employee name</h1>
-			
-			Details:
-			<dl>
-				<dt>ID</dt>
-				<dd data-bind:text="id">000</dd>
-				
-				<dt>Department</dt>
-				<dd data-bind:text="title">JOBTITLE</dd>
-			</dl>
-		</li>
-	</ul>
-</body>
-HTML;
-
-	const HTML_FORM = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Form test</title>
-
-<body>
-	Contact form:
-	
-	<form method="post">
-		<label>
-			<span>Your name</span>
-			<input name="your-name" required />		
-		</label>
-		<label>
-			<span>Your telephone</span>
-			<input name="telephone" type="tel" />		
-		</label>
-		<label>
-			<span>Message</span>
-			<textarea name="message" required></textarea>		
-		</label>
-		<button name="do" value="submit">Submit!</button>
-	</form>
-</body>
-HTML;
-
-	const HTML_DYNAMIC_FORM = <<<HTML
-<!doctype html>
-<meta charset="utf-8" />
-<title>Dynamic form test</title>
-
-<body>
-	<form>
-		<label data-template>
-			<span data-bind:text="label">Label text</span>
-			<input name="{name}" data-bind:required="?required" data-bind:placeholder="placeholder" data-bind-attributes /> 
-		</label>
-	</form>
-</body>
-HTML;
-
-
-}
\ No newline at end of file
diff --git a/test/phpunit/Helper/TodoItemExampleObject.php b/test/phpunit/Helper/TodoItemExampleObject.php
deleted file mode 100644
index 42bc349..0000000
--- a/test/phpunit/Helper/TodoItemExampleObject.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace Gt\DomTemplate\Test\Helper;
-
-class TodoItemExampleObject {
-	public $id;
-	public $title;
-
-	public function __construct(int $id, string $title) {
-		$this->id = $id;
-		$this->title = $title;
-	}
-}
\ No newline at end of file
diff --git a/test/phpunit/Helper/TodoListExampleObject.php b/test/phpunit/Helper/TodoListExampleObject.php
deleted file mode 100644
index 66b2a91..0000000
--- a/test/phpunit/Helper/TodoListExampleObject.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-namespace Gt\DomTemplate\Test\Helper;
-
-use Iterator;
-
-class TodoListExampleObject implements Iterator {
-	/** @var TodoItemExampleObject[] */
-	protected $iterator;
-	/** @var int */
-	protected $iteratorKey;
-
-	public function __construct(array $items = []) {
-		$this->iterator = [];
-		$this->iteratorKey = 0;
-
-		foreach($items as $i => $title) {
-			$this->iterator []= new TodoItemExampleObject($i, $title);
-		}
-	}
-
-	/** @link https://php.net/manual/en/iterator.current.php */
-	public function current():TodoItemExampleObject {
-		return $this->iterator[$this->iteratorKey];
-	}
-
-	/** @link https://php.net/manual/en/iterator.next.php */
-	public function next():void {
-		$this->iteratorKey++;
-	}
-
-	/** @link https://php.net/manual/en/iterator.key.php */
-	public function key():int {
-		return $this->iteratorKey;
-	}
-
-	/** @link https://php.net/manual/en/iterator.valid.php */
-	public function valid():bool {
-		return isset($this->iterator[$this->iteratorKey]);
-	}
-
-	/** @link https://php.net/manual/en/iterator.rewind.php */
-	public function rewind():void {
-		$this->iteratorKey = 0;
-	}
-}
\ No newline at end of file
diff --git a/test/phpunit/ListBinderTest.php b/test/phpunit/ListBinderTest.php
new file mode 100644
index 0000000..b883309
--- /dev/null
+++ b/test/phpunit/ListBinderTest.php
@@ -0,0 +1,492 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use ArrayIterator;
+use DateInterval;
+use DateTime;
+use Gt\Dom\HTMLElement\HTMLLiElement;
+use Gt\DomTemplate\Bind;
+use Gt\DomTemplate\ElementBinder;
+use Gt\DomTemplate\ListBinder;
+use Gt\DomTemplate\TableElementNotFoundInContextException;
+use Gt\DomTemplate\TemplateCollection;
+use Gt\DomTemplate\TemplateElement;
+use Gt\DomTemplate\Test\TestFactory\DocumentTestFactory;
+use PHPUnit\Framework\TestCase;
+use Stringable;
+
+class ListBinderTest extends TestCase {
+	public function testBindList_emptyList():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_LIST_TEMPLATE);
+
+		$templateCollection = new TemplateCollection($document);
+		$sut = new ListBinder($templateCollection);
+		$boundCount = $sut->bindListData(
+			[],
+			$document
+		);
+		self::assertSame(0, $boundCount);
+	}
+
+	public function testBindList_emptyList_iterator():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_LIST_TEMPLATE);
+
+		$templateCollection = self::createMock(TemplateCollection::class);
+
+		$sut = new ListBinder($templateCollection);
+		$boundCount = $sut->bindListData(
+			new ArrayIterator([]),
+			$document
+		);
+		self::assertSame(0, $boundCount);
+	}
+
+	public function testBindList_noMatchingTemplate():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_LIST_TEMPLATE);
+		$templateCollection = self::createMock(TemplateCollection::class);
+		$templateCollection->expects(self::once())
+			->method("get")
+			->with($document->documentElement, "missing")
+			->willReturnCallback(function() {
+				throw new TableElementNotFoundInContextException();
+			});
+
+		$sut = new ListBinder($templateCollection);
+		self::expectException(TableElementNotFoundInContextException::class);
+		$sut->bindListData(
+			["one", "two", "three"],
+			$document,
+			"missing"
+		);
+	}
+
+	public function testBindList_simpleList():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_LIST_TEMPLATE);
+		$templateElement = new TemplateElement($document->querySelector("li[data-template]"));
+
+		$templateCollection = self::createMock(TemplateCollection::class);
+		$templateCollection->expects(self::once())
+			->method("get")
+			->with($document->documentElement, null)
+			->willReturn($templateElement);
+
+		$ul = $document->querySelector("ul");
+		self::assertCount(
+			0,
+			$ul->children,
+			"There should be no LI elements in the UL at the start of the test"
+		);
+
+		$testData = ["one", "two", "three"];
+		$sut = new ListBinder($templateCollection);
+		$boundCount = $sut->bindListData(
+			$testData,
+			$document
+		);
+
+		self::assertSame(count($testData), $boundCount);
+		self::assertCount(
+			$boundCount,
+			$ul->children,
+			"The correct number of LI elements should have been inserted into the UL"
+		);
+
+		foreach($testData as $i => $value) {
+			self::assertSame($value, $ul->children[$i]->textContent);
+		}
+	}
+
+	/**
+	 * This tests what happens when the context element has more than one
+	 * element with a data-template attribute. In this test, we expect the
+	 * two template elements to have different template names.
+	 */
+	public function testBindListData_twoLists():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TWO_LISTS);
+		$templateElementProgLang = new TemplateElement(
+			$document->querySelector("#favourites li[data-template='prog-lang']")
+		);
+		$templateElementGame = new TemplateElement(
+			$document->querySelector("#favourites li[data-template='game']")
+		);
+
+		$templateCollection = self::createMock(TemplateCollection::class);
+		$templateCollection->expects(self::exactly(2))
+			->method("get")
+			->withConsecutive(
+				[$document->documentElement, "prog-lang"],
+				[$document->documentElement, "game"]
+			)
+			->willReturnOnConsecutiveCalls($templateElementProgLang, $templateElementGame);
+
+		$sut = new ListBinder($templateCollection);
+		$progLangData = ["PHP", "HTML", "bash"];
+		$sut->bindListData($progLangData, $document, "prog-lang");
+		$gameData = ["Pac Man", "Mega Man", "Tetris"];
+		$sut->bindListData($gameData, $document, "game");
+
+		foreach($progLangData as $i => $progLang) {
+			self::assertSame($progLang, $document->querySelectorAll("#prog-lang-list li")[$i]->textContent);
+		}
+
+		foreach($gameData as $i => $game) {
+			self::assertSame($game, $document->querySelectorAll("#game-list li")[$i]->textContent);
+		}
+	}
+
+	public function testBindListData_empty_parentShouldBeEmpty():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_LIST_TEMPLATE);
+		$templateElement = new TemplateElement($document->querySelector("li[data-template]"));
+		$templateCollection = self::createMock(TemplateCollection::class);
+		$templateCollection->method("get")
+			->willReturn($templateElement);
+
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData([], $document);
+
+		self::assertSame("", $document->querySelector("ul")->innerHTML);
+	}
+
+	public function testBindListData_kvpList_array():void {
+		$kvpList = [
+			["userId" => 543, "username" => "win95", "orderCount" => 55],
+			["userId" => 559, "username" => "seafoam", "orderCount" => 30],
+			["userId" => 274, "username" => "hammatime", "orderCount" => 23],
+		];
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_USER_ORDER_LIST);
+		$orderList = $document->querySelector("ul");
+
+		$templateElement = new TemplateElement($document->querySelector("ul li[data-template]"));
+		$templateCollection = self::createMock(TemplateCollection::class);
+		$templateCollection->method("get")
+			->willReturn($templateElement);
+
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData($kvpList, $orderList);
+
+		foreach($orderList->children as $i => $li) {
+			/** @var HTMLLiElement $li */
+			self::assertEquals($kvpList[$i]["userId"], $li->querySelector("h3 span")->textContent);
+			self::assertEquals($kvpList[$i]["username"], $li->querySelector("h2 span")->textContent);
+			self::assertEquals($kvpList[$i]["orderCount"], $li->querySelector("p span")->textContent);
+		}
+	}
+
+	public function testBindListData_kvpList_object():void {
+		$kvpList = [
+			(object)["userId" => 543, "username" => "win95", "orderCount" => 55],
+			(object)["userId" => 559, "username" => "seafoam", "orderCount" => 30],
+			(object)["userId" => 274, "username" => "hammatime", "orderCount" => 23],
+		];
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_USER_ORDER_LIST);
+		$orderList = $document->querySelector("ul");
+
+		$templateElement = new TemplateElement($document->querySelector("ul li[data-template]"));
+		$templateCollection = self::createMock(TemplateCollection::class);
+		$templateCollection->method("get")
+			->willReturn($templateElement);
+
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData($kvpList, $orderList);
+
+		foreach($orderList->children as $i => $li) {
+			/** @var HTMLLiElement $li */
+			self::assertEquals($kvpList[$i]->{"userId"}, $li->querySelector("h3 span")->textContent);
+			self::assertEquals($kvpList[$i]->{"username"}, $li->querySelector("h2 span")->textContent);
+			self::assertEquals($kvpList[$i]->{"orderCount"}, $li->querySelector("p span")->textContent);
+		}
+	}
+
+	public function testBindListData_kvpList_instanceObject():void {
+		$kvpList = [
+			new class { public int $userId = 543; public string $username = "win95"; public int $orderCount = 55; },
+			new class { public int $userId = 559; public string $username = "seafoam"; public int $orderCount = 30; },
+			new class { public int $userId = 274; public string $username = "hammatime"; public int $orderCount = 23; },
+		];
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_USER_ORDER_LIST);
+		$orderList = $document->querySelector("ul");
+
+		$templateElement = new TemplateElement($document->querySelector("ul li[data-template]"));
+		$templateCollection = self::createMock(TemplateCollection::class);
+		$templateCollection->method("get")
+			->willReturn($templateElement);
+
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData($kvpList, $orderList);
+
+		foreach($orderList->children as $i => $li) {
+			/** @var HTMLLiElement $li */
+			self::assertEquals($kvpList[$i]->{"userId"}, $li->querySelector("h3 span")->textContent);
+			self::assertEquals($kvpList[$i]->{"username"}, $li->querySelector("h2 span")->textContent);
+			self::assertEquals($kvpList[$i]->{"orderCount"}, $li->querySelector("p span")->textContent);
+		}
+	}
+
+	public function testBindListData_kvpList_instanceObjectWithBindAttributeMethods():void {
+		$kvpList = [
+			new class {
+				#[Bind("userId")]
+				public function getId():int {
+					return 534;
+				}
+				#[Bind("username")]
+				public function getUsername():string {
+					return "win95";
+				}
+				#[Bind("this-matches-nothing")]
+				public function getNothing():string {
+					return "nothing!";
+				}
+				#[Bind("orderCount")]
+				public function getTotalOrders():int {
+					return 55;
+				}
+			},
+			new class {
+				#[Bind("userId")]
+				public function getId():int {
+					return 559;
+				}
+				#[Bind("username")]
+				public function getUsername():string {
+					return "seafoam";
+				}
+				#[Bind("orderCount")]
+				public function getTotalOrders():int {
+					return 30;
+				}
+			},
+			new class {
+				#[Bind("userId")]
+				public function getId():int {
+					return 274;
+				}
+				#[Bind("username")]
+				public function getUsername():string {
+					return "hammatime";
+				}
+				#[Bind("orderCount")]
+				public function getTotalOrders():int {
+					return 23;
+				}
+			},
+		];
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_USER_ORDER_LIST);
+		$orderList = $document->querySelector("ul");
+
+		$templateElement = new TemplateElement($document->querySelector("ul li[data-template]"));
+		$templateCollection = self::createMock(TemplateCollection::class);
+		$templateCollection->method("get")
+			->willReturn($templateElement);
+
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData($kvpList, $orderList);
+
+		foreach($orderList->children as $i => $li) {
+			/** @var HTMLLiElement $li */
+			self::assertEquals($kvpList[$i]->getId(), $li->querySelector("h3 span")->textContent);
+			self::assertEquals($kvpList[$i]->getUsername(), $li->querySelector("h2 span")->textContent);
+			self::assertEquals($kvpList[$i]->getTotalOrders(), $li->querySelector("p span")->textContent);
+		}
+	}
+
+	public function testBindListData_kvpList_instanceObjectWithBindAttributeProperties():void {
+		$kvpList = [
+			new class {
+				#[Bind("userId")]
+				public int $id = 534;
+
+				#[Bind("username")]
+				public string $user = "win95";
+
+				#[Bind("this-matches-nothing")]
+				public string $nothing = "nothing!";
+
+				#[Bind("orderCount")]
+				public int $totalOrders = 55;
+			},
+			new class {
+				#[Bind("userId")]
+				public int $id = 559;
+
+				#[Bind("username")]
+				public string $user = "seafoam";
+
+				#[Bind("orderCount")]
+				public int $totalOrders = 30;
+			},
+			new class {
+				#[Bind("userId")]
+				public int $id = 274;
+
+				#[Bind("username")]
+				public string $user = "hammatime";
+
+				#[Bind("orderCount")]
+				public int $totalOrders = 23;
+			},
+		];
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_USER_ORDER_LIST);
+		$orderList = $document->querySelector("ul");
+
+		$templateElement = new TemplateElement($document->querySelector("ul li[data-template]"));
+		$templateCollection = self::createMock(TemplateCollection::class);
+		$templateCollection->method("get")
+			->willReturn($templateElement);
+
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData($kvpList, $orderList);
+
+		foreach($orderList->children as $i => $li) {
+			/** @var HTMLLiElement $li */
+			self::assertEquals($kvpList[$i]->id, $li->querySelector("h3 span")->textContent);
+			self::assertEquals($kvpList[$i]->user, $li->querySelector("h2 span")->textContent);
+			self::assertEquals($kvpList[$i]->totalOrders, $li->querySelector("p span")->textContent);
+		}
+	}
+
+	public function testBindListData_nestedList():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_MUSIC_NO_TEMPLATE_NAMES);
+		$templateCollection = new TemplateCollection($document);
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData(TestData::MUSIC, $document);
+
+		$artistNameArray = array_keys(TestData::MUSIC);
+		foreach($document->querySelectorAll("body>ul>li") as $i => $artistElement) {
+			$artistName = $artistNameArray[$i];
+			self::assertEquals(
+				$artistName,
+				$artistElement->querySelector("h2")->textContent
+			);
+
+			$albumNameArray = array_keys(TestData::MUSIC[$artistName]);
+			foreach($artistElement->querySelectorAll("ul>li") as $j => $albumElement) {
+				$albumName = $albumNameArray[$j];
+				self::assertEquals(
+					$albumName,
+					$albumElement->querySelector("h3")->textContent
+				);
+
+				$trackNameArray = TestData::MUSIC[$artistName][$albumName];
+				foreach($albumElement->querySelectorAll("ol>li") as $k => $trackElement) {
+					$trackName = $trackNameArray[$k];
+					self::assertEquals(
+						$trackName,
+						$trackElement->textContent
+					);
+				}
+			}
+		}
+	}
+
+	public function testBindListData_nestedList_withKvps():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_STUDENT_LIST);
+		$templateCollection = new TemplateCollection($document);
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData(TestData::STUDENTS, $document);
+
+		foreach($document->querySelectorAll("body>ul>li") as $i => $studentLiElement) {
+			self::assertEquals(
+				TestData::STUDENTS[$i]["firstName"] . " " . TestData::STUDENTS[$i]["lastName"],
+				$studentLiElement->querySelector(".name")->textContent
+			);
+
+			foreach($studentLiElement->querySelectorAll(".modules li") as $j => $moduleElement) {
+				self::assertEquals(
+					TestData::STUDENTS[$i]["modules"][$j],
+					$moduleElement->textContent
+				);
+			}
+		}
+	}
+
+	public function testBindListData_iterativeSomething():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_SEQUENCES);
+		$templateCollection = new TemplateCollection($document);
+		$listData = [
+			"Primes" => new ArrayIterator([2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71]),
+			"Fibonacci" => new ArrayIterator([0,1,1,2,3,5,8,13,21,34,55,89,144,233,377,610,987,1597,2584,4181,6765]),
+		];
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData($listData, $document);
+
+		$listDataKeys = array_keys($listData);
+		foreach($document->querySelectorAll("ul>li") as $i => $sequenceLI) {
+			self::assertEquals($listDataKeys[$i], $sequenceLI->querySelector("h2")->textContent);
+
+			foreach($sequenceLI->querySelectorAll("ol>li") as $j => $numberLI) {
+				self::assertEquals($listData[$listDataKeys[$i]][$j], $numberLI->textContent);
+			}
+		}
+	}
+
+	public function testBindListData_dateTime():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_DATES);
+		$templateCollection = new TemplateCollection($document);
+		$listData = [];
+
+		$dateTime = new DateTime();
+		$currentYear = $dateTime->format("Y");
+		$dateTime->setDate($currentYear, 1, 1);
+
+		while($dateTime->format("Y") === $currentYear) {
+			array_push($listData, new class(clone $dateTime) implements Stringable {
+				public function __construct(private DateTime $dateTime) {}
+				public function __toString():string {
+					return $this->dateTime->format("F: l");
+				}
+			});
+			$dateTime->add(new DateInterval("P1M"));
+		}
+
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData($listData, $document);
+
+		foreach($document->querySelectorAll("li") as $i => $li) {
+			self::assertSame((string)$listData[$i], $li->textContent);
+		}
+	}
+
+	public function testBindListData_todoList():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TODO);
+		$templateCollection = new TemplateCollection($document);
+		$data = TestData::TODO_DATA;
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData($data, $document);
+
+		$todoLiElements = $document->querySelectorAll("ul>li");
+		foreach($data as $i => $todoItem) {
+			/** @var HTMLLiElement $li */
+			$li = $todoLiElements[$i];
+			self::assertEquals($todoItem["id"], $li->querySelector("[name=id]")->value);
+			self::assertEquals($todoItem["title"], $li->querySelector("[name=title]")->value);
+			if($todoItem["completedAt"]) {
+				self::assertTrue($li->classList->contains("completed"));
+			}
+		}
+	}
+
+	public function testBindListData_multipleTemplateSiblings():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_GOOD_BAD);
+		$templateCollection = new TemplateCollection($document);
+		$sut = new ListBinder($templateCollection);
+		$sut->bindListData(["Good news 1", "Good news 2"], $document, "good");
+		$sut->bindListData(["Bad news 1", "Bad news 2"], $document, "bad");
+		$sut->bindListData(["Good news 3", "Good news 4"], $document, "good");
+		$sut->bindListData(["Bad news 3", "Bad news 4"], $document, "bad");
+
+		$expected = [
+			"Good news 1",
+			"Good news 2",
+			"Bad news 1",
+			"Bad news 2",
+			"Good news 3",
+			"Good news 4",
+			"Bad news 3",
+			"Bad news 4",
+		];
+		foreach($document->querySelectorAll("li") as $i => $li) {
+			self::assertEquals($expected[$i], $li->querySelector("span")->textContent);
+		}
+	}
+}
diff --git a/test/phpunit/ModularContentTest.php b/test/phpunit/ModularContentTest.php
new file mode 100644
index 0000000..537d023
--- /dev/null
+++ b/test/phpunit/ModularContentTest.php
@@ -0,0 +1,66 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use Gt\DomTemplate\ModularContent;
+use Gt\DomTemplate\ModularContentDirectoryNotFoundException;
+use Gt\DomTemplate\ModularContentFileNotFoundException;
+use PHPUnit\Framework\TestCase;
+
+class ModularContentTest extends TestCase {
+	private string $baseDir;
+
+	protected function setUp():void {
+		$this->baseDir = tempnam(sys_get_temp_dir(), "phpgt-domtemplate-test");
+		$this->removeTempDir();
+		mkdir($this->baseDir, 0775, true);
+	}
+
+	protected function tearDown():void {
+		$this->removeTempDir();
+	}
+
+	public function testConstruct_throwsIfDirectoryNotExist():void {
+		$dir = $this->baseDir . "/" . uniqid("random-");
+		self::expectException(ModularContentDirectoryNotFoundException::class);
+		self::expectExceptionMessage("The modular content path does not exist: $dir");
+		new ModularContent($dir);
+	}
+
+	public function testGetContent_notExists():void {
+		$dir = $this->baseDir . "/" . uniqid("_partial");
+		mkdir($dir);
+		$sut = new ModularContent($dir);
+		self::expectException(ModularContentFileNotFoundException::class);
+		self::expectExceptionMessage("The modular content file does not exist: $dir/nothing.html");
+		$sut->getContent("nothing");
+	}
+
+	public function testGetContent():void {
+		$expectedContent = "Test file contents";
+		$dir = $this->baseDir . "/" . uniqid("_partial");
+		mkdir($dir);
+		file_put_contents("$dir/test.html", $expectedContent);
+		$sut = new ModularContent($dir);
+		self::assertSame(
+			$expectedContent,
+			$sut->getContent("test")
+		);
+	}
+
+	public function testGetHTMLDocument():void {
+		$expectedContent = "<!doctype html><h1>Test file contents</h1>";
+		$dir = $this->baseDir . "/" . uniqid("_partial");
+		mkdir($dir);
+		file_put_contents("$dir/test.html", $expectedContent);
+		$sut = new ModularContent($dir);
+		$document = $sut->getHTMLDocument("test");
+		self::assertSame(
+			"Test file contents",
+			$document->querySelector("h1")->textContent
+		);
+	}
+
+	protected function removeTempDir():void {
+		exec("rm -rf " . $this->baseDir);
+	}
+}
diff --git a/test/phpunit/ModularContentTestCase.php b/test/phpunit/ModularContentTestCase.php
new file mode 100644
index 0000000..183851f
--- /dev/null
+++ b/test/phpunit/ModularContentTestCase.php
@@ -0,0 +1,44 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use Gt\Dom\HTMLDocument;
+use Gt\DomTemplate\ModularContent;
+use Gt\DomTemplate\ModularContentFileNotFoundException;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class ModularContentTestCase extends TestCase {
+	/**
+	 * @param array<string, string> $contentFiles Associative array where
+	 * the key is the modular content's name, and the value is its content.
+	 */
+	protected function mockModularContent(
+		string $dirName,
+		array $contentFiles = []
+	):MockObject|ModularContent {
+		$mock = self::createMock(ModularContent::class);
+		$mock->method("getContent")
+			->willReturnCallback(
+				function(string $name) use($contentFiles) {
+					$content = $contentFiles[$name] ?? null;
+					if(is_null($content)) {
+						throw new ModularContentFileNotFoundException();
+					}
+
+					return $content;
+				}
+			);
+		$mock->method("getHTMLDocument")
+			->willReturnCallback(
+				function(string $name) use($contentFiles) {
+					$content = $contentFiles[$name] ?? null;
+					if(is_null($content)) {
+						throw new ModularContentFileNotFoundException();
+					}
+
+					return new HTMLDocument($content);
+				}
+			);
+		return $mock;
+	}
+}
diff --git a/test/phpunit/PartialExpanderTest.php b/test/phpunit/PartialExpanderTest.php
new file mode 100644
index 0000000..1454531
--- /dev/null
+++ b/test/phpunit/PartialExpanderTest.php
@@ -0,0 +1,93 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use Gt\Dom\Element;
+use Gt\Dom\HTMLDocument;
+use Gt\DomTemplate\CommentIni;
+use Gt\DomTemplate\ModularContent;
+use Gt\DomTemplate\ModularContentFileNotFoundException;
+use Gt\DomTemplate\PartialExpander;
+use Gt\DomTemplate\Test\TestFactory\DocumentTestFactory;
+
+class PartialExpanderTest extends ModularContentTestCase {
+	public function testExpand_noMatchingPartial():void {
+		$modularContent = self::mockModularContent(
+			"_partial", [
+				"nothing" => "this doesn't exist",
+			]
+		);
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_EXTENDS_PARTIAL_VIEW);
+		$sut = new PartialExpander(
+			$document,
+			$modularContent
+		);
+		self::expectException(ModularContentFileNotFoundException::class);
+		self::assertEmpty($sut->expand());
+	}
+
+	public function testExpand():void {
+		$modularContent = self::mockModularContent(
+			"_partial", [
+				"base-page" => DocumentTestFactory::HTML_PARTIAL_VIEW
+			]
+		);
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_EXTENDS_PARTIAL_VIEW);
+
+		$mainElement = $document->querySelector("body>main");
+		self::assertNull($mainElement);
+
+		$sut = new PartialExpander(
+			$document,
+			$modularContent
+		);
+		$expandedPartials = $sut->expand();
+		$mainElement = $document->querySelector("body>main");
+		self::assertNotNull($mainElement);
+
+		self::assertCount(1, $expandedPartials);
+		self::assertSame("base-page", $expandedPartials[0]);
+
+		self::assertSame("My website!", $document->querySelector("body>header>h1")->textContent);
+		self::assertStringContainsString(
+			"The page content will go in here.",
+			$mainElement->firstChild->textContent,
+			"The original content of the partial element should not be removed."
+		);
+
+		self::assertSame("Hello from within a sub-template!", $mainElement->querySelector("h1")->textContent);
+	}
+
+	public function testExpand_noExtendsSectionOfCommentIni():void {
+		$document = DocumentTestFactory::createHTML();
+		$modularContent = self::createMock(ModularContent::class);
+
+		$sut = new PartialExpander($document, $modularContent);
+		self::assertEmpty($sut->expand());
+	}
+
+	public function testExpand_recursive():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_EXTENDS_PARTIAL_VIEW_RECURSIVE);
+		$modularContent = self::mockModularContent(
+			"_partial", [
+				"extended-page" => DocumentTestFactory::HTML_EXTENDS_PARTIAL_VIEW_RECURSIVE_BASE,
+				"partial-base" => DocumentTestFactory::HTML_PARTIAL_VIEW,
+			]
+		);
+		$sut = new PartialExpander($document, $modularContent);
+		$sut->expand();
+		$body = $document->body;
+		$main = $body->querySelector("main");
+		$outer = $main->querySelector(".outer");
+		$inner = $outer->querySelector(".inner");
+
+		self::assertStringContainsString(
+			"This is an inner DIV",
+			$inner->querySelector("p")->textContent
+		);
+		self::assertStringContainsString(
+			"This is the outer DIV",
+			$outer->querySelector("p")->textContent
+		);
+		self::assertSame("This title was set in the inner partial view.", $document->title);
+	}
+}
diff --git a/test/phpunit/PlaceholderBinderTest.php b/test/phpunit/PlaceholderBinderTest.php
new file mode 100644
index 0000000..9dc513b
--- /dev/null
+++ b/test/phpunit/PlaceholderBinderTest.php
@@ -0,0 +1,49 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use Gt\Dom\HTMLElement\HTMLAnchorElement;
+use Gt\DomTemplate\PlaceholderBinder;
+use Gt\DomTemplate\Test\TestFactory\DocumentTestFactory;
+use PHPUnit\Framework\TestCase;
+
+class PlaceholderBinderTest extends TestCase {
+	public function testBind():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_PLACEHOLDER);
+		$greetingElement = $document->querySelector("#test2 .greeting");
+		$sut = new PlaceholderBinder();
+// We can now bind text to the placeholder, and the text will
+// magically be replaced.
+		$sut->bind("name", "Cody", $greetingElement);
+		self::assertSame("Hello, Cody!", $greetingElement->textContent);
+		self::assertSame('<p class="greeting">Hello, Cody!</p>', $greetingElement->outerHTML);
+	}
+
+	public function testBind_contextDoesNotLeak():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_PLACEHOLDER);
+		$greetingElement = $document->querySelector("#test2 .greeting");
+		$sut = new PlaceholderBinder();
+		$sut->bind("name", "Cody", $greetingElement);
+		self::assertStringContainsString("Cody", $document->querySelector("#test2 .greeting")->textContent);
+		self::assertStringNotContainsString("Cody", $document->querySelector("#test1 .greeting")->textContent);
+		self::assertStringNotContainsString("Cody", $document->querySelector("#test2a .greeting")->textContent);
+	}
+
+	public function testBind_noContextBindsAll():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_PLACEHOLDER);
+		$sut = new PlaceholderBinder();
+		$sut->bind("name", "Cody", $document);
+		self::assertStringContainsString("Cody", $document->querySelector("#test1 .greeting")->textContent);
+		self::assertStringContainsString("Cody", $document->querySelector("#test2 .greeting")->textContent);
+		self::assertStringContainsString("Cody", $document->querySelector("#test2a .greeting")->textContent);
+	}
+
+	public function testBind_attribute():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_PLACEHOLDER);
+		$sut = new PlaceholderBinder();
+		$testElement = $document->getElementById("test3");
+		/** @var HTMLAnchorElement $link */
+		$link = $testElement->querySelector("a");
+		$sut->bind("repoName", "domtemplate", $testElement);
+		self::assertSame("https://www.php.gt/domtemplate", $link->href);
+	}
+}
diff --git a/test/phpunit/TableBinderTest.php b/test/phpunit/TableBinderTest.php
new file mode 100644
index 0000000..127a71d
--- /dev/null
+++ b/test/phpunit/TableBinderTest.php
@@ -0,0 +1,376 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use Gt\Dom\HTMLElement\HTMLTableCellElement;
+use Gt\Dom\HTMLElement\HTMLTableElement;
+use Gt\Dom\HTMLElement\HTMLTableRowElement;
+use Gt\Dom\HTMLElement\HTMLTableSectionElement;
+use Gt\DomTemplate\IncorrectTableDataFormat;
+use Gt\DomTemplate\TableBinder;
+use Gt\DomTemplate\Test\TestFactory\DocumentTestFactory;
+use PHPUnit\Framework\TestCase;
+
+class TableBinderTest extends TestCase {
+	/**
+	 * Binding table data into an empty table will create all the
+	 * appropriate <thead>, <tbody>, <tr>, <th>, and <td> elements.
+	 */
+	public function testBindTable_emptyTable():void {
+		$sut = new TableBinder();
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLES);
+
+		/** @var HTMLTableElement $table */
+		$table = $document->getElementById("tbl1");
+
+		self::assertEmpty($table->innerHTML);
+		$sut->bindTableData([
+			["Column 1", "Column 2", "Column 3"],
+			["c1 val1", "c2 val1", "c3 val1"],
+			["c1 val2", "c2 val2", "c3 val2"],
+			["c1 val3", "c2 val3", "c3 val3"],
+		], $table);
+
+		self::assertSame("Column 1", $table->tHead->rows[0]->children[0]->textContent);
+		self::assertSame("Column 2", $table->tHead->rows[0]->children[1]->textContent);
+		self::assertSame("Column 3", $table->tHead->rows[0]->children[2]->textContent);
+
+		/** @var HTMLTableSectionElement $tBody */
+		$tBody = $table->tBodies[0];
+		self::assertCount(3, $tBody->children);
+
+		self::assertSame("c1 val2", $tBody->rows[1]->children[0]->textContent);
+		self::assertSame("c2 val2", $tBody->rows[1]->children[1]->textContent);
+		self::assertSame("c3 val2", $tBody->rows[1]->children[2]->textContent);
+	}
+
+	/**
+	 * Binding table data into a table that already has a <thead> element
+	 * will use the existing <th> values to limit which columns are output.
+	 */
+	public function testBindTable_existingTHead():void {
+		$sut = new TableBinder();
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLES);
+
+		/** @var HTMLTableElement $table */
+		$table = $document->getElementById("tbl2");
+
+		$thead = $table->tHead;
+		$originalTheadHTML = $thead->innerHTML;
+
+		$tableData = [
+// Notice that there are more columns here than in the actual HTML.
+			["id", "firstName", "lastName", "username", "email"],
+			[34, "Derek", "Rethans", "derek", "derek@php.net"],
+			[35, "Christoph", "Becker", "cmbecker69", "cmbecker69@php.net"],
+			[25, "Sara", "Golemon", "pollita", "pollita@php.net"],
+		];
+		$sut->bindTableData($tableData, $table);
+
+		/** @var HTMLTableSectionElement $tbody */
+		$tbody = $table->tBodies[0];
+
+		self::assertSame($originalTheadHTML, $thead->innerHTML);
+		self::assertCount(count($tableData), $tbody->rows);
+		/** @var HTMLTableRowElement $row0 */
+		$row0 = $tbody->rows[0];
+		/** @var HTMLTableRowElement $row1 */
+		$row1 = $tbody->rows[1];
+		/** @var HTMLTableRowElement $row2 */
+		$row2 = $tbody->rows[2];
+		/** @var HTMLTableRowElement $row3 */
+		$row3 = $tbody->rows[3];
+		self::assertCount(3, $row0->cells);
+		self::assertCount(3, $row1->cells);
+		self::assertCount(3, $row2->cells);
+		self::assertCount(3, $row3->cells);
+
+		self::assertSame("Greg", $row0->cells[0]->textContent);
+		self::assertSame("Bowler", $row0->cells[1]->textContent);
+		self::assertSame("greg@php.gt", $row0->cells[2]->textContent);
+		self::assertSame("Derek", $row1->cells[0]->textContent);
+		self::assertSame("Rethans", $row1->cells[1]->textContent);
+		self::assertSame("derek@php.net", $row1->cells[2]->textContent);
+		self::assertSame("Christoph", $row2->cells[0]->textContent);
+		self::assertSame("Becker", $row2->cells[1]->textContent);
+		self::assertSame("cmbecker69@php.net", $row2->cells[2]->textContent);
+		self::assertSame("Sara", $row3->cells[0]->textContent);
+		self::assertSame("Golemon", $row3->cells[1]->textContent);
+		self::assertSame("pollita@php.net", $row3->cells[2]->textContent);
+	}
+
+	public function testBindTable_dataNormalised():void {
+		$sut = new TableBinder();
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLES);
+
+		/** @var HTMLTableElement $table */
+		$table = $document->getElementById("tbl2");
+
+		$tableData = [
+			"id" => [34, 35, 25],
+			"firstName" => ["Derek", "Christoph", "Sara"],
+			"lastName" => ["Rethans", "Becker", "Golemon"],
+			"username" => ["derek", "cmbecker69", "pollita"],
+			"email" => ["derek@php.net", "cmbecker69@php.net", "pollita@php.net"],
+		];
+		$sut->bindTableData(
+			$tableData,
+			$table
+		);
+
+		/** @var HTMLTableSectionElement $tbody */
+		$tbody = $table->tBodies[0];
+		/** @var HTMLTableRowElement $row0 */
+		$row0 = $tbody->rows[0];
+		/** @var HTMLTableRowElement $row1 */
+		$row1 = $tbody->rows[1];
+		/** @var HTMLTableRowElement $row2 */
+		$row2 = $tbody->rows[2];
+		/** @var HTMLTableRowElement $row3 */
+		$row3 = $tbody->rows[3];
+
+		self::assertSame("Greg", $row0->cells[0]->textContent);
+		self::assertSame("Bowler", $row0->cells[1]->textContent);
+		self::assertSame("greg@php.gt", $row0->cells[2]->textContent);
+		self::assertSame("Derek", $row1->cells[0]->textContent);
+		self::assertSame("Rethans", $row1->cells[1]->textContent);
+		self::assertSame("derek@php.net", $row1->cells[2]->textContent);
+		self::assertSame("Christoph", $row2->cells[0]->textContent);
+		self::assertSame("Becker", $row2->cells[1]->textContent);
+		self::assertSame("cmbecker69@php.net", $row2->cells[2]->textContent);
+		self::assertSame("Sara", $row3->cells[0]->textContent);
+		self::assertSame("Golemon", $row3->cells[1]->textContent);
+		self::assertSame("pollita@php.net", $row3->cells[2]->textContent);
+	}
+
+	/**
+	 * A "double header" is a term I use to describe tables that have
+	 * header data in the first column going along the top, but also another
+	 * header line as the first row. See the MDN example for why <th> might
+	 * be present in the first column of a table:
+	 * @link https://developer.mozilla.org/en-US/docs/Web/HTML/Element/tbody
+	 */
+	public function testBindTable_doubleHeader_shouldEmitTHElementsInRows():void {
+		$sut = new TableBinder();
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLES);
+
+		/** @var HTMLTableElement $table */
+		$table = $document->getElementById("tbl1");
+
+		$tableData = [
+			["Item", "Price", "Stock Level"],
+			[
+				"Washing machine" => [698_00, 24],
+				"Television" => [998_00, 7],
+				"Laptop" => [799_99, 60],
+			]
+		];
+		$sut->bindTableData(
+			$tableData,
+			$table
+		);
+
+		/** @var HTMLTableSectionElement $tbody */
+		$tbody = $table->tBodies[0];
+		/** @var HTMLTableRowElement $row0 */
+		$row0 = $tbody->rows[0];
+		/** @var HTMLTableRowElement $row1 */
+		$row1 = $tbody->rows[1];
+		/** @var HTMLTableRowElement $row2 */
+		$row2 = $tbody->rows[2];
+
+		foreach($row0->cells as $i => $cell) {
+			/** @var HTMLTableCellElement $cell */
+			if($i === 0) {
+				self::assertSame("TH", $cell->tagName);
+				self::assertSame("Washing machine", $cell->textContent);
+			}
+			else {
+				self::assertSame("TD", $cell->tagName);
+				self::assertEquals($tableData[1]["Washing machine"][$i - 1], $cell->textContent);
+			}
+		}
+
+		foreach($row1->cells as $i => $cell) {
+			/** @var HTMLTableCellElement $cell */
+			if($i === 0) {
+				self::assertSame("TH", $cell->tagName);
+				self::assertSame("Television", $cell->textContent);
+			}
+			else {
+				self::assertSame("TD", $cell->tagName);
+				self::assertEquals($tableData[1]["Television"][$i - 1], $cell->textContent);
+			}
+		}
+
+		foreach($row2->cells as $i => $cell) {
+			/** @var HTMLTableCellElement $cell */
+			if($i === 0) {
+				self::assertSame("TH", $cell->tagName);
+				self::assertSame("Laptop", $cell->textContent);
+			}
+			else {
+				self::assertSame("TD", $cell->tagName);
+				self::assertEquals($tableData[1]["Laptop"][$i - 1], $cell->textContent);
+			}
+		}
+	}
+
+	public function testBindTable_nonIterableValue():void {
+		$sut = new TableBinder();
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLES);
+
+		/** @var HTMLTableElement $table */
+		$table = $document->getElementById("tbl1");
+
+		$tableData = [
+			["Item", "Price", "Stock Level"],
+			"incorrect",
+			"table",
+			"format",
+		];
+		self::expectException(IncorrectTableDataFormat::class);
+		self::expectExceptionMessage("Row 1 data is not iterable.");
+		$sut->bindTableData(
+			$tableData,
+			$table
+		);
+	}
+
+	public function testBindTable_doubleHeaderNonIterableValue():void {
+		$sut = new TableBinder();
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLES);
+
+		/** @var HTMLTableElement $table */
+		$table = $document->getElementById("tbl1");
+
+		$tableData = [
+			["Item", "Price", "Stock Level"],
+			[
+// Note that the inner array does not represent its data as an array.
+				"Washing machine" => 698_00,
+				"Television" => 998_00,
+				"Laptop" => 799_99,
+			]
+		];
+		self::expectException(IncorrectTableDataFormat::class);
+		self::expectExceptionMessage("Row 1 has a string key (Washing machine) but the value is not iterable.");
+		$sut->bindTableData($tableData, $table);
+	}
+
+	public function testBindTable_assocArrayWithoutIterableColumns():void {
+		$sut = new TableBinder();
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLES);
+
+		/** @var HTMLTableElement $table */
+		$table = $document->getElementById("tbl1");
+		$tableData = [
+// This is emulating a common syntax mistake - the columns are not within an
+// array, but from a glance the shape looks OK.
+			"Item" => ["Washing machine", "Television", "Laptop"],
+			"Price" => 698_00, 998_00, 799_99,
+			"Stock Level", [24, 7, 60],
+		];
+		self::expectException(IncorrectTableDataFormat::class);
+		self::expectExceptionMessage("Column data \"Price\" is not iterable.");
+		$sut->bindTableData($tableData, $table);
+	}
+
+	public function testBindTable_multipleTables():void {
+		$sut = new TableBinder();
+		$tableData = [
+			"id" => [34, 35, 25],
+			"firstName" => ["Derek", "Christoph", "Sara"],
+			"lastName" => ["Rethans", "Becker", "Golemon"],
+			"username" => ["derek", "cmbecker69", "pollita"],
+			"email" => ["derek@php.net", "cmbecker69@php.net", "pollita@php.net"],
+		];
+
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLES);
+		$sut->bindTableData(
+			$tableData,
+			$document->getElementById("multi-table-container")
+		);
+
+		$tableList = $document->querySelectorAll("#multi-table-container table");
+		self::assertCount(3, $tableList);
+
+		foreach($tableList as $table) {
+			/** @var HTMLTableElement $table */
+			if($table->parentElement->id === "s2") {
+				continue;
+			}
+
+			/** @var HTMLTableSectionElement $tbody */
+			$tbody = $table->tBodies[0];
+			$tableDataKeys = array_keys($tableData);
+			foreach($tbody->rows as $rowIndex => $row) {
+				/** @var HTMLTableRowElement $row */
+				foreach($row->cells as $cellIndex => $cell) {
+					$key = $tableDataKeys[$cellIndex];
+					self::assertEquals(
+						$tableData[$key][$rowIndex],
+						$cell->textContent
+					);
+				}
+			}
+		}
+	}
+
+	public function testBindTable_keyNamesInTHead():void {
+		$sut = new TableBinder();
+		$tableData = [
+			"id" => [34, 35, 25],
+			"firstName" => ["Derek", "Christoph", "Sara"],
+			"lastName" => ["Rethans", "Becker", "Golemon"],
+			"username" => ["derek", "cmbecker69", "pollita"],
+			"email" => ["derek@php.net", "cmbecker69@php.net", "pollita@php.net"],
+		];
+
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLES);
+		/** @var HTMLTableElement $table */
+		$table = $document->getElementById("tbl3");
+		$sut->bindTableData(
+			$tableData,
+			$table
+		);
+
+		$tableDataKeys = [];
+		foreach($table->rows as $rowIndex => $row) {
+			/** @var $row HTMLTableRowElement */
+			if($rowIndex === 1) {
+				self::assertEquals("Greg", $row->cells[0]->textContent);
+				continue;
+			}
+
+			foreach($row->cells as $cellIndex => $cell) {
+				if($rowIndex === 0) {
+					array_push($tableDataKeys, $cell->textContent);
+					continue;
+				}
+
+				$key = $tableDataKeys[$cellIndex];
+				self::assertEquals(
+// `$rowIndex - 2` because we're counting the header, and the pre-existing row.
+					$tableData[$key][$rowIndex - 2],
+					$cell->textContent
+				);
+			}
+		}
+	}
+
+	public function testBindTableData_documentContext():void {
+		$sut = new TableBinder();
+		$tableData = [
+			"id" => [34, 35, 25],
+			"firstName" => ["Derek", "Christoph", "Sara"],
+			"lastName" => ["Rethans", "Becker", "Golemon"],
+			"username" => ["derek", "cmbecker69", "pollita"],
+			"email" => ["derek@php.net", "cmbecker69@php.net", "pollita@php.net"],
+		];
+
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TABLE_NO_BIND_KEY);
+		$sut->bindTableData($tableData, $document);
+
+		self::assertCount(4, $document->querySelectorAll("table tr"));
+	}
+}
diff --git a/test/phpunit/TemplateCollectionTest.php b/test/phpunit/TemplateCollectionTest.php
new file mode 100644
index 0000000..8b66c79
--- /dev/null
+++ b/test/phpunit/TemplateCollectionTest.php
@@ -0,0 +1,118 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use Gt\DomTemplate\ElementBinder;
+use Gt\DomTemplate\TemplateCollection;
+use Gt\DomTemplate\TemplateElementNotFoundInContextException;
+use Gt\DomTemplate\Test\TestFactory\DocumentTestFactory;
+use PHPUnit\Framework\TestCase;
+
+class TemplateCollectionTest extends TestCase {
+	public function testGet_noName_noMatch():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_LIST_TEMPLATE);
+		$sut = new TemplateCollection($document);
+
+		self::expectException(TemplateElementNotFoundInContextException::class);
+		$sut->get($document->querySelector("ol"));
+	}
+
+	public function testGet_noName():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_LIST_TEMPLATE);
+		$ul = $document->querySelector("ul");
+		$ol = $document->querySelector("ol");
+		self::assertCount(1, $ul->children);
+		self::assertCount(1, $ol->children);
+		$sut = new TemplateCollection($document);
+		self::assertCount(0, $ul->children);
+		self::assertCount(1, $ol->children);
+		$templateElement = $sut->get($document);
+		$inserted = $templateElement->insertTemplate();
+		self::assertSame("LI", $inserted->tagName);
+		self::assertSame($ul, $templateElement->getTemplateParent());
+		self::assertSame($ul, $inserted->parentElement);
+	}
+
+	public function testGet_name_noMatch():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TWO_LISTS);
+		$sut = new TemplateCollection($document);
+
+		self::expectException(TemplateElementNotFoundInContextException::class);
+		self::expectExceptionMessage('Template element with name "unknown-list" can not be found within the context HTML element.');
+		$sut->get($document, "unknown-list");
+	}
+
+	public function testGet_name():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_TWO_LISTS);
+		$sut = new TemplateCollection($document);
+
+		$templateElement = $sut->get($document, "prog-lang");
+		self::assertSame(
+			$document->getElementById("prog-lang-list"),
+			$templateElement->getTemplateParent()
+		);
+	}
+
+	/**
+	 * Baby steps...(this comment was written as part of DomTemplate's TDD).
+	 * Instead of jumping into the implementation of recursive nested list
+	 * binding, we're going to manually iterate over a data source and
+	 * bind the appropriate elements by their explicit template name.
+	 *
+	 * This is a manually-bound version of
+	 * ListBinderTest::testBindListData_nestedList()
+	 */
+	public function testBindListData_nestedList_manual():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_MUSIC_EXPLICIT_TEMPLATE_NAMES);
+		$templateCollection = new TemplateCollection($document);
+		$elementBinder = new ElementBinder();
+
+		foreach(TestData::MUSIC as $artistName => $albumList) {
+			$artistTemplate = $templateCollection->get($document, "artist");
+			$artistElement = $artistTemplate->insertTemplate();
+			$elementBinder->bind(null, $artistName, $artistElement);
+
+			foreach($albumList as $albumName => $trackList) {
+				$albumTemplate = $templateCollection->get($document, "album");
+				$albumElement = $albumTemplate->insertTemplate();
+				$elementBinder->bind(null, $albumName, $albumElement);
+
+				foreach($trackList as $trackName) {
+					$trackTemplate = $templateCollection->get($document, "track");
+					$trackElement = $trackTemplate->insertTemplate();
+					$elementBinder->bind(
+						null,
+						$trackName,
+						$trackElement
+					);
+				}
+			}
+		}
+
+		$artistNameArray = array_keys(TestData::MUSIC);
+		foreach($document->querySelectorAll("body>ul>li") as $i => $artistElement) {
+			$artistName = $artistNameArray[$i];
+			self::assertEquals(
+				$artistName,
+				$artistElement->querySelector("h2")->textContent
+			);
+
+			$albumNameArray = array_keys(TestData::MUSIC[$artistName]);
+			foreach($artistElement->querySelectorAll("ul>li") as $j => $albumElement) {
+				$albumName = $albumNameArray[$j];
+				self::assertEquals(
+					$albumName,
+					$albumElement->querySelector("h3")->textContent
+				);
+
+				$trackNameArray = TestData::MUSIC[$artistName][$albumName];
+				foreach($albumElement->querySelectorAll("ol>li") as $k => $trackElement) {
+					$trackName = $trackNameArray[$k];
+					self::assertEquals(
+						$trackName,
+						$trackElement->textContent
+					);
+				}
+			}
+		}
+	}
+}
diff --git a/test/phpunit/TemplateElementTest.php b/test/phpunit/TemplateElementTest.php
new file mode 100644
index 0000000..348424c
--- /dev/null
+++ b/test/phpunit/TemplateElementTest.php
@@ -0,0 +1,20 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+use Gt\DomTemplate\InvalidTemplateElementNameException;
+use Gt\DomTemplate\TemplateElement;
+use Gt\DomTemplate\Test\TestFactory\DocumentTestFactory;
+use PHPUnit\Framework\TestCase;
+
+class TemplateElementTest extends TestCase {
+	public function testGetTemplateName_forwardSlashStarter():void {
+		$document = DocumentTestFactory::createHTML(DocumentTestFactory::HTML_EMPTY);
+		$originalElement = $document->createElement("div");
+		$originalElement->setAttribute("data-template", "/oh/dear/oh/dear");
+		$document->body->appendChild($originalElement);
+		$sut = new TemplateElement($originalElement);
+		self::expectException(InvalidTemplateElementNameException::class);
+		self::expectExceptionMessage('A template\'s name must not start with a forward slash ("/oh/dear/oh/dear")');
+		$sut->getTemplateName();
+	}
+}
diff --git a/test/phpunit/TemplateParentTest.php b/test/phpunit/TemplateParentTest.php
deleted file mode 100644
index 1a212af..0000000
--- a/test/phpunit/TemplateParentTest.php
+++ /dev/null
@@ -1,490 +0,0 @@
-<?php
-namespace Gt\DomTemplate\Test;
-
-use Gt\Dom\DocumentFragment;
-use Gt\DomTemplate\Element;
-use Gt\DomTemplate\HTMLDocument;
-use Gt\DomTemplate\Test\Helper\Helper;
-
-class TemplateParentTest extends TestCase {
-	const TEST_DIR = "/tmp/phpgt/domtemplate/test";
-	const COMPONENT_PATH = "_component";
-
-	protected function setUp():void {
-		$this->rrmdir(self::TEST_DIR);
-		mkdir(
-			self::TEST_DIR . "/" . self::COMPONENT_PATH,
-			0775,
-			true
-		);
-	}
-
-	protected function tearDown():void {
-		$this->rrmdir(self::TEST_DIR);
-	}
-
-	public function testTemplateExtractWithNoTemplatesCount() {
-		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES);
-		$count = $document->extractTemplates();
-		self::assertEquals(0, $count);
-	}
-
-	public function testTemplateExtractWithNoTemplatesDoesNotAffectContent() {
-		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES);
-		$nodeList = $document->querySelectorAll("*");
-		$document->extractTemplates();
-		$newNodeList = $document->querySelectorAll("*");
-		self::assertCount(count($nodeList), $newNodeList);
-	}
-
-	public function testTemplateExtractCount() {
-		$document = new HTMLDocument(Helper::HTML_TEMPLATES);
-		$count = $document->extractTemplates();
-		self::assertEquals(3, $count);
-	}
-
-	public function testTemplateExtractRemovesTemplates() {
-		$document = new HTMLDocument(Helper::HTML_TEMPLATES);
-		$templateElements = $document->querySelectorAll("template,[data-template]");
-		self::assertGreaterThan(0, count($templateElements));
-		$document->extractTemplates();
-		$newTemplateElements = $document->querySelectorAll("template,[data-template]");
-		self::assertCount(0, $newTemplateElements);
-	}
-
-	public function testGetTemplate() {
-		$document = new HTMLDocument(Helper::HTML_TEMPLATES);
-		$document->extractTemplates();
-		$t = $document->getTemplate("title-definition");
-		self::assertInstanceOf(DocumentFragment::class, $t);
-		self::assertCount(2, $t->children);
-	}
-
-	public function testGetTemplateNoName() {
-		$document = new HTMLDocument(Helper::HTML_SELECT);
-		$document->extractTemplates();
-		$select = $document->getElementById("sut");
-		self::assertCount(0, $select->children);
-		$t = $select->getTemplate();
-		self::assertInstanceOf(DocumentFragment::class, $t);
-		$t->insertTemplate();
-		self::assertCount(1, $select->children);
-	}
-
-	public function testExpandComponentsNoComponents() {
-		$templateDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		$document = new HTMLDocument(Helper::HTML_TEMPLATES);
-		$count = $document->expandComponents($templateDir);
-		self::assertEquals(0, $count);
-	}
-
-	public function testExpandComponents() {
-		$componentDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		file_put_contents(
-			"$componentDir/title-definition-list.html",
-			Helper::COMPONENT_TITLE_DEFINITION_LIST
-		);
-		file_put_contents(
-			"$componentDir/title-definition.html",
-			Helper::COMPONENT_TITLE_DEFINITION
-		);
-		file_put_contents(
-			"$componentDir/ordered-list.html",
-			Helper::COMPONENT_ORDERED_LIST
-		);
-
-		$document = new HTMLDocument(
-			Helper::HTML_COMPONENTS,
-			$componentDir
-		);
-		self::assertInstanceOf(
-			Element::class,
-			$document->querySelector("title-definition-list")
-		);
-		self::assertInstanceOf(
-			Element::class,
-			$document->querySelector("ordered-list")
-		);
-
-		$elementBeforeOrderedList = $document->querySelector("ordered-list")->previousElementSibling;
-
-		$count = $document->expandComponents($componentDir);
-		self::assertEquals(2, $count);
-		self::assertNull(
-			$document->querySelector("title-definition-list")
-		);
-		self::assertNull(
-			$document->querySelector("ordered-list")
-		);
-
-		self::assertEquals(
-			"ol",
-			$elementBeforeOrderedList->nextElementSibling->tagName
-		);
-	}
-
-	public function testExistingClassPersistedToExpandedComponent() {
-		$componentDirectory = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		file_put_contents(
-			"$componentDirectory/ordered-list.html",
-			Helper::HTML_COMPONENT_WITH_CLASS_ON_PARENT
-		);
-		$document = new HTMLDocument(
-			Helper::HTML_COMPONENTS,
-			$componentDirectory
-		);
-		$document->expandComponents();
-
-		$expandedComponent = $document->querySelector(
-			".c-ordered-list"
-		);
-		self::assertTrue($expandedComponent->classList->contains(
-			"existing-class"
-		));
-	}
-
-	public function testNestedComponentsExpand() {
-		// While the count of the expandCompnents > 0, do it again on the expanded component...
-		$templateDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		file_put_contents(
-			"$templateDir/ordered-list.html",
-			Helper::COMPONENT_ORDERED_LIST
-		);
-		file_put_contents(
-			"$templateDir/ordered-list-item.html",
-			Helper::COMPONENT_ORDERED_LIST_ITEM
-		);
-		$document = new HTMLDocument(
-			Helper::HTML_COMPONENTS,
-			$templateDir
-		);
-		$document->expandComponents();
-
-		$section = $document->querySelector("section");
-		self::assertEquals("ol", $section->lastElementChild->tagName);
-		self::assertEquals(
-			"li",
-			$section->lastElementChild->lastElementChild->tagName
-		);
-	}
-
-	public function testComponentWithinTemplate() {
-		$templateDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		file_put_contents(
-			"$templateDir/outer-nested-thing.html",
-			Helper::COMPONENT_OUTER_NESTED_THING
-		);
-		file_put_contents(
-			"$templateDir/inner-nested-thing.html",
-			Helper::COMPONENT_INNER_NESTED_THING
-		);
-		$document = new HTMLDocument(
-			Helper::HTML_TEMPLATE_WITH_NESTED_COMPONENT,
-			$templateDir
-		);
-		$document->expandComponents();
-		$document->extractTemplates();
-
-		self::assertCount(
-			0,
-			$document->querySelectorAll("li")
-		);
-		self::assertCount(
-			0,
-			$document->querySelectorAll("nested-thing")
-		);
-
-		for($i = 0; $i < 10; $i++) {
-			$t = $document->getTemplate("inner-template-item");
-			$t->querySelector(".number")->innerText = $i + 1;
-			$t->insertTemplate();
-		}
-
-		self::assertCount(
-			$i,
-			$document->querySelectorAll("li")
-		);
-		self::assertCount(
-			0,
-			$document->querySelectorAll("nested-thing")
-		);
-		self::assertCount(
-			$i * 2,
-			$document->querySelectorAll("p")
-		);
-
-		for($i = 0; $i < 10; $i++) {
-			$numberElement = $document->querySelectorAll("p .number")[$i];
-			self::assertEquals($i + 1, $numberElement->innerText);
-		}
-	}
-
-	public function testNestedComponentsExpandWhenTemplateInserted() {
-		// While the count of the expandCompnents > 0, do it again on the expanded component...
-		$templateDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		file_put_contents(
-			"$templateDir/title-definition-list.html",
-			Helper::COMPONENT_TITLE_DEFINITION_LIST
-		);
-		file_put_contents(
-			"$templateDir/title-definition.html",
-			Helper::COMPONENT_TITLE_DEFINITION
-		);
-		file_put_contents(
-			"$templateDir/ordered-list.html",
-			Helper::COMPONENT_ORDERED_LIST
-		);
-		file_put_contents(
-			"$templateDir/ordered-list-item.html",
-			Helper::COMPONENT_ORDERED_LIST_ITEM
-		);
-		$document = new HTMLDocument(
-			Helper::HTML_COMPONENTS,
-			$templateDir
-		);
-		$document->expandComponents();
-		$document->extractTemplates();
-
-		$section = $document->querySelector("section");
-		$ol = $section->lastElementChild;
-		self::assertEquals("ol", $ol->tagName);
-		self::assertEquals("li", $ol->firstElementChild->tagName);
-
-		$expandedComponent = $document->querySelector("dl");
-		self::assertInstanceOf(Element::class, $expandedComponent);
-		self::assertInstanceOf(Element::class, $expandedComponent->firstElementChild);
-		self::assertInstanceOf(Element::class, $expandedComponent->lastElementChild);
-		self::assertEquals("dt", $expandedComponent->firstElementChild->tagName);
-		self::assertEquals("dd", $expandedComponent->lastElementChild->tagName);
-	}
-
-	public function testGetTemplateFromFile() {
-		$templateDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		file_put_contents(
-			"$templateDir/title-definition.html",
-			Helper::COMPONENT_TITLE_DEFINITION
-		);
-		$document = new HTMLDocument(
-			Helper::HTML_NO_TEMPLATES,
-			$templateDir
-		);
-
-		$fragment = $document->getTemplate("title-definition");
-		self::assertInstanceOf(DocumentFragment::class, $fragment);
-	}
-
-	public function testTemplateAttributeTidied() {
-		$document = new HTMLDocument(Helper::HTML_TEMPLATES);
-		$document->extractTemplates();
-		$t = $document->getTemplate("list-item");
-		$inserted = $t->insertTemplate();
-		self::assertNull($inserted->getAttribute("data-template"));
-	}
-
-	public function testTemplatePrefixAddedToTemplateElements() {
-		$document = new HTMLDocument(Helper::HTML_TEMPLATES);
-		$document->extractTemplates();
-		$t = $document->getTemplate("list-item");
-		$inserted = $t->insertTemplate();
-		self::assertTrue($inserted->classList->contains("t-list-item"));
-		self::assertFalse($inserted->classList->contains("c-list-item"));
-	}
-
-	public function testComponentPrefixAddedToComponentElements() {
-		$componentDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		file_put_contents(
-			"$componentDir/title-definition-list.html",
-			Helper::COMPONENT_TITLE_DEFINITION_LIST
-		);
-		file_put_contents(
-			"$componentDir/title-definition.html",
-			Helper::COMPONENT_TITLE_DEFINITION
-		);
-		file_put_contents(
-			"$componentDir/ordered-list.html",
-			Helper::COMPONENT_ORDERED_LIST
-		);
-
-		$document = new HTMLDocument(
-			Helper::HTML_COMPONENTS,
-			$componentDir
-		);
-		$document->expandComponents();
-
-		self::assertCount(
-			2,
-			$document->querySelectorAll(
-				".c-title-definition-list,.c-ordered-list"
-			)
-		);
-		self::assertCount(
-			0,
-			$document->querySelectorAll(
-				".t-title-definition-list,.t-ordered-list"
-			)
-		);
-	}
-
-	public function testComponentAndTemplatePrefixAddedToTemplateComponentElement() {
-		$componentDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		file_put_contents(
-			"$componentDir/title-definition-list.html",
-			Helper::COMPONENT_TITLE_DEFINITION_LIST
-		);
-		file_put_contents(
-			"$componentDir/title-definition.html",
-			Helper::COMPONENT_TITLE_DEFINITION
-		);
-		file_put_contents(
-			"$componentDir/ordered-list.html",
-			Helper::COMPONENT_ORDERED_LIST
-		);
-
-		$document = new HTMLDocument(
-			Helper::HTML_COMPONENTS,
-			$componentDir
-		);
-		$document->expandComponents();
-
-		$t = $document->getTemplate("title-definition-list");
-		self::assertInstanceOf(DocumentFragment::class, $t);
-		$inserted = $document->body->appendChild($t);
-
-		self::assertTrue(
-			$inserted->classList->contains("c-title-definition-list")
-		);
-		self::assertTrue(
-			$inserted->classList->contains("t-title-definition-list")
-		);
-	}
-
-	public function testComponentAndTemplatePrefixAddedCorrectlyWithNamedTemplate() {
-		$componentDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		file_put_contents(
-			"$componentDir/title-definition-list.html",
-			Helper::COMPONENT_TITLE_DEFINITION_LIST
-		);
-		file_put_contents(
-			"$componentDir/title-definition.html",
-			Helper::COMPONENT_TITLE_DEFINITION
-		);
-		file_put_contents(
-			"$componentDir/ordered-list.html",
-			Helper::COMPONENT_ORDERED_LIST
-		);
-
-		$document = new HTMLDocument(
-			Helper::HTML_COMPONENTS_WITH_NAMED_TEMPLATE,
-			$componentDir
-		);
-		$document->extractTemplates();
-		$document->expandComponents();
-
-		$t = $document->getTemplate("tdlist");
-		$inserted = $t->insertTemplate();
-
-		self::assertTrue(
-			$inserted->classList->contains("c-title-definition-list")
-		);
-		self::assertTrue(
-			$inserted->classList->contains("t-tdlist")
-		);
-		self::assertFalse(
-			$inserted->classList->contains("t-title-definition-list")
-		);
-		$classes = explode(" ", $inserted->className);
-		self::assertCount(2, $classes);
-	}
-
-	public function testExistingClassesAreAddedToComponents() {
-		$componentDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		file_put_contents(
-			"$componentDir/title-definition-list.html",
-			Helper::COMPONENT_TITLE_DEFINITION_LIST
-		);
-		file_put_contents(
-			"$componentDir/title-definition.html",
-			Helper::COMPONENT_TITLE_DEFINITION
-		);
-
-		$document = new HTMLDocument(
-			Helper::HTML_COMPONENT_WITH_CLASS,
-			$componentDir
-		);
-		$document->extractTemplates();
-		$document->expandComponents();
-
-		$component = $document->querySelector(".c-title-definition-list");
-		self::assertTrue(
-			$component->classList->contains("source-class")
-		);
-	}
-
-	/** @link https://github.com/PhpGt/DomTemplate/issues/105 */
-	public function testTemplateWithinComponentIsAddedCorrectly() {
-		$componentDir = self::TEST_DIR . "/" . self::COMPONENT_PATH;
-		file_put_contents(
-			"$componentDir/simple-list.html",
-			Helper::COMPONENT_WITH_TEMPLATE
-		);
-
-		$document = new HTMLDocument(
-			Helper::HTML_SIMPLE_LIST_COMPONENT,
-			$componentDir
-		);
-		$document->expandComponents();
-		$document->extractTemplates();
-
-		$componentElement = $document->querySelector(".c-simple-list");
-		self::assertCount(0, $componentElement->children);
-
-		$componentElement->bindList([
-			"one",
-			"two",
-			"three",
-		]);
-
-		self::assertCount(3, $componentElement->children);
-	}
-
-	public function testExtractTemplatesSetsParentInnerHTMLToEmpty() {
-		$document = new HTMLDocument(Helper::HTML_TODO_LIST);
-		$document->extractTemplates();
-		$todoListElement = $document->getElementById("todo-list");
-		self::assertEmpty($todoListElement->innerHTML);
-	}
-
-	public function testExtractTemplatesSetsNestedParentInnerHTMLToEmpty() {
-		$document = new HTMLDocument(Helper::HTML_NESTED_LIST);
-		$document->extractTemplates();
-		$outerListElement = $document->querySelector("ul");
-		self::assertEmpty($outerListElement->innerHTML);
-	}
-
-	public function testExtractTemplatesSetsNestedParentInnerHTMLPartiallyToEmpty() {
-		$document = new HTMLDocument(Helper::HTML_NESTED_LIST);
-		$document->extractTemplates();
-		$outerListElement = $document->querySelector("ul");
-		$document->bindNestedList([
-			"Outer 1" => [
-				"1:1" => [],
-				"1:2" => [],
-				"1:3" => [],
-			],
-			"Outer 2" => [],
-			"Outer 3" => [
-				"3:1" => [
-					"Example" => (object)[
-						"name" => "Here I am!"
-					]
-				],
-				"3:2" => [],
-			],
-		]);
-
-		self::assertNotEmpty($outerListElement->innerHTML);
-		self::assertNotEmpty($outerListElement->querySelectorAll("ol")[0]->innerHTML);
-		self::assertNotEmpty($outerListElement->querySelectorAll("ol")[2]->innerHTML);
-		self::assertEmpty($outerListElement->querySelectorAll("ol")[1]->innerHTML);
-	}
-}
\ No newline at end of file
diff --git a/test/phpunit/TestCase.php b/test/phpunit/TestCase.php
deleted file mode 100644
index 0df4558..0000000
--- a/test/phpunit/TestCase.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-namespace Gt\DomTemplate\Test;
-
-use PHPUnit\Framework\TestCase as PHPUnitTestCase;
-
-class TestCase extends PHPUnitTestCase {
-	protected function rrmdir($dir):void {
-		if(is_dir($dir)) {
-			foreach(scandir($dir) as $file) {
-				if($file != "." && $file != "..") {
-					if(is_dir($dir . "/" . $file)) {
-						$this->rrmdir($dir . "/" . $file);
-					}
-					else {
-						unlink($dir . "/" . $file);
-					}
-				}
-			}
-
-			rmdir($dir);
-		}
-	}
-}
\ No newline at end of file
diff --git a/test/phpunit/TestData.php b/test/phpunit/TestData.php
new file mode 100644
index 0000000..d3639fe
--- /dev/null
+++ b/test/phpunit/TestData.php
@@ -0,0 +1,97 @@
+<?php
+namespace Gt\DomTemplate\Test;
+
+class TestData {
+	const MUSIC = [
+		"A Band From Your Childhood" => [
+			"This Album is Good" => [
+				"The Best Song You‘ve Ever Heard",
+				"Another Cracking Tune",
+				"Top Notch Music Here",
+				"The Best Is Left ‘Til Last",
+			],
+			"Adequate Collection" => [
+				"Meh",
+				"‘sok",
+				"Sounds Like Every Other Song",
+			],
+		],
+		"Bongo and The Bronks" => [
+			"Salad" => [
+				"Tomatoes",
+				"Song About Cucumber",
+				"Onions Make Me Cry (but I love them)",
+			],
+			"Meat" => [
+				"Steak",
+				"Is Chicken Really a Meat?",
+				"Don‘t Look in the Sausage Factory",
+				"Stop Horsing Around",
+			],
+			"SnaxX" => [
+				"Crispy Potatoes With Salt",
+				"Pretzel Song",
+				"Pork Scratchings Are Skin",
+				"The Peanut Is Not Actually A Nut",
+			],
+		],
+		"Crayons" => [
+			"Pastel Colours" => [
+				"Egg Shell",
+				"Cotton",
+				"Frost",
+				"Periwinkle",
+			],
+			"Different Shades of Blue" => [
+				"Cobalt",
+				"Slate",
+				"Indigo",
+				"Teal",
+			],
+		]
+	];
+
+	const STUDENTS = [
+		[
+			"firstName" => "Freddie",
+			"lastName" => "Williams",
+			"modules" => [
+				"Programming 1", "Networking Fundamentals", "Computational Logic"
+			]
+		],
+		[
+			"firstName" => "Melissa",
+			"lastName" => "Adams",
+			"modules" => [
+				"Computational Mathematics", "Networks and Security", "Graphics I"
+			]
+		],
+		[
+			"firstName" => "Sofia",
+			"lastName" => "Reid",
+			"modules" => [
+				"Databases", "Programming 2", "Networking Fundamentals"
+			]
+		],
+	];
+
+	const TODO_DATA = [
+		[
+			"id" => 100,
+			"title" => "Create DOM facade",
+			"completedAt" => "2021-05-18 10:03:57",
+		], [
+			"id" => 101,
+			"title" => "Bind data to the DOM",
+			"completedAt" => "2021-05-18 16:32:20",
+		], [
+			"id" => 102,
+			"title" => "Bundle into WebEngine",
+			"completedAt" => null,
+		], [
+			"id" => 103,
+			"title" => "Release WebEngine v4",
+			"completedAt" => null,
+		]
+	];
+}
diff --git a/test/phpunit/TestFactory/DocumentTestFactory.php b/test/phpunit/TestFactory/DocumentTestFactory.php
new file mode 100644
index 0000000..75ce540
--- /dev/null
+++ b/test/phpunit/TestFactory/DocumentTestFactory.php
@@ -0,0 +1,499 @@
+<?php
+namespace Gt\DomTemplate\Test\TestFactory;
+
+use Gt\Dom\Facade\HTMLDocumentFactory;
+use Gt\Dom\Facade\XMLDocumentFactory;
+use Gt\Dom\HTMLDocument;
+use Gt\Dom\XMLDocument;
+
+class DocumentTestFactory {
+	const HTML_EMPTY = <<<HTML
+<!doctype html>
+HTML;
+
+	const HTML_NO_BIND_PROPERTY = <<<HTML
+<!doctype html>
+<output data-bind>Nothing is bound</output>
+HTML;
+
+	const HTML_SINGLE_ELEMENT = <<<HTML
+<!doctype html>
+<output data-bind:text>Nothing is bound</output>
+HTML;
+
+	const HTML_SYNONYMOUS_BIND_PROPERTIES = <<<HTML
+<!doctype html>
+<output id="o1" data-bind:text>Nothing is bound</output>
+<output id="o2" data-bind:textContent>Nothing is bound</output>
+<output id="o3" data-bind:text-content>Nothing is bound</output>
+<output id="o4" data-bind:innerText>Nothing is bound</output>
+<output id="o5" data-bind:inner-text>Nothing is bound</output>
+
+<output id="o6" data-bind:html>Nothing is bound</output>
+<output id="o7" data-bind:HTML>Nothing is bound</output>
+<output id="o8" data-bind:innerHTML>Nothing is bound</output>
+<output id="o9" data-bind:inner-html>Nothing is bound</output>
+HTML;
+
+
+	const HTML_MULTIPLE_ELEMENTS = <<<HTML
+<!doctype html>
+<output id="o1" data-bind:text>First default</output>
+<output id="o2" data-bind:text>Second default</output>
+<output id="o3" data-bind:text>Third default</output>
+HTML;
+
+	const HTML_MULTIPLE_NESTED_ELEMENTS = <<<HTML
+<!doctype html>
+<div id="container1">
+	<output id="o1" data-bind:text>First default</output>
+	<output id="o2" data-bind:text>Second default</output>
+	<output id="o3" data-bind:text>Third default</output>
+</div>
+<div id="container2">
+	<output id="o4" data-bind:text>Fourth default</output>
+	<output id="o5" data-bind:text>Fifth default</output>
+	<output id="o6" data-bind:text>Sixth default</output>
+</div>
+<div id="container3">
+	<h1 data-bind:text="title">Default title</h1>
+	<output id="o7" data-bind:text>Seventh default</output>
+	<p>
+		You have just bound the <span data-bind:text="title">default title</span> title!
+	</p>
+</div>
+HTML;
+
+	const HTML_USER_PROFILE = <<<HTML
+<!doctype html>
+<h1>User profile</h1>
+<dl>
+	<dt>Username</dt>
+	<dd id="dd1" data-bind:text="username">username123</dd>
+	<dt>Email address</dt>
+	<dd id="dd2" data-bind:text="email">you@example.com</dd>
+	<dt>Category</dt>
+	<dd id="dd3" data-bind:text="category">N/A</dd>
+</dl>
+
+<h2>Audit trail</h2>
+<div id="audit-trail">
+	<p>The following activity has been recorded on your account:</p>
+	
+	<ul></ul>
+</div>
+HTML;
+
+	const HTML_DIFFERENT_BIND_PROPERTIES = <<<HTML
+<!doctype html>
+<img id="img1" class="main" src="/default.png" alt="Not bound" 
+	data-bind:src="photoURL" 
+	data-bind:alt="altText" 
+	data-bind:class="size" />
+
+<img id="img2" class="secondary" src="/default.png" alt="Not bound"
+	data-bind:class=":is-selected" />
+
+<img id="img3" class="secondary" src="/default.png" alt="Not bound"
+	data-bind:class=":isSelected selected-image" />
+
+<p id="p1" data-params="funny friendly" data-bind:data-params=":isMagic magical">Is this paragraph magical?</p>
+
+<form id="form1">
+	<button id="btn1" data-bind:disabled="?isBtn1Disabled" />
+	<button id="btn2" data-bind:disabled="?!isBtn2Enabled" />
+</form>
+HTML;
+
+	const HTML_TABLES = <<<HTML
+<!doctype html>
+<table id="tbl1" data-bind:table="tableData"></table>
+
+<table id="tbl2" data-bind:table="tableData">
+	<thead>
+		<tr>
+			<th data-table-key="firstName">First name</th>
+			<th data-table-key="lastName">Last name</th>
+			<th data-table-key="email">Email address</th>
+		</tr>	
+	</thead>
+	<tbody>
+		<tr>
+<!-- This row already exists in the HTML and should be kept when new data is bound -->
+			<td>Greg</td>
+			<td>Bowler</td>
+			<td>greg@php.gt</td>
+		</tr>
+	</tbody>
+</table>
+
+<table id="tbl3">
+	<thead>
+		<tr>
+<!-- Here you can see the data's key is in the TH elements. -->
+			<th>firstName</th>
+			<th>lastName</th>
+			<th>email</th>
+		</tr>	
+	</thead>
+	<tbody>
+		<tr>
+<!-- This row already exists in the HTML and should be kept when new data is bound -->
+			<td>Greg</td>
+			<td>Bowler</td>
+			<td>greg@php.gt</td>
+		</tr>
+	</tbody>
+</table>
+
+<div id="multi-table-container">
+	<section id="s1">
+		<p>First table:</p>
+		<table data-bind:table="tableData"></table>	
+	</section>
+	
+	<section id="s2">
+		<p>Second table (different data):</p>
+		<table data-bind:table="tableData2"></table>	
+	</section>
+	
+	<section id="s3">
+		<p>Third table (same data):</p>
+		<table data-bind:table="tableData"></table>	
+	</section>
+</div>
+HTML;
+	const HTML_NO_TABLE = <<<HTML
+<!doctype html>
+<div data-bind:table="tableData">
+	<p>There's no table in here, mate.</p>
+</div>
+HTML;
+
+	const HTML_TABLE_NO_BIND_KEY = <<<HTML
+<!doctype html>
+<div data-bind:table>
+	<table></table>
+</div>
+HTML;
+
+	const HTML_LIST_TEMPLATE = <<<HTML
+<!doctype html>
+<ul>
+	<li data-template data-bind:text>Template item!</li>
+</ul>
+<ol>
+	<li>This doesn't have a data-template attribute</li>
+</ol>
+HTML;
+
+	const HTML_TWO_LISTS = <<<HTML
+<!doctype html>
+<div id="favourites">
+	<h1>My favourite programming languages</h1>
+	<ul id="prog-lang-list">
+		<li data-template="prog-lang" data-bind:text>Programming language goes here</li>
+	</ul>
+	
+	<h1>My favourite video games</h1>
+	<ul id="game-list">
+		<li data-template="game" data-bind:text>Video game goes here</li>
+	</ul>
+</div>
+HTML;
+	const HTML_USER_ORDER_LIST = <<<HTML
+<!doctype html>
+<div id="orders">
+	<h1>Most active users</h1>
+	<ul>
+		<li data-template>
+			<h2>Username: <span data-bind:text="username">username</span></h2>
+			<h3>ID: <span data-bind:text="userId">000</span></h3>
+			<p>Number of orders: <span data-bind:text="orderCount">0</span></p>
+		</li>
+	</ul>
+</div>
+HTML;
+	const HTML_PLACEHOLDER = <<<HTML
+<!doctype html>
+<main id="test1">
+	<p>This example shows how to bind text into placeholders.</p>
+	<p class="greeting">Hello, {{name}}!</p>
+</main>
+<main id="test2">
+	<p>This example shows how to bind text into placeholders.</p>
+	<p>Now with a default value!</p>
+	<p class="greeting">Hello, {{name ?? you}}!</p>
+</main>
+<main id="test2a">
+	<p>This example shows how to bind text into placeholders.</p>
+	<p>Now with a default value, with a different use of white space!</p>
+	<p class="greeting">Hello, {{name??you}}!</p>
+</main>
+<main id="test3">
+	<p>This example shows how to bind text into attribute placeholders.</p>
+	<p>For more information, <a href="https://www.php.gt/{{repoName}}">view the docs.</a></p>
+</main>
+<main id="test4">
+	<p>This example shows how to bind text into attribute placeholders.</p>
+	<p>For more information, <a href="https://www.php.gt/{{repoName ?? domtemplate}}">view the docs.</a></p>
+</main>
+HTML;
+	const HTML_MUSIC_EXPLICIT_TEMPLATE_NAMES = <<<HTML
+<!doctype html>
+<h1>Music library</h1>
+
+<ul>
+	<li data-template="artist">
+		<h2 data-bind:text>Artist name</h2>
+		
+		<ul>
+			<li data-template="album">
+				<h3 data-bind:text>Album name</h3>
+				
+				<ol>
+					<li data-template="track" data-bind:text>Track name</li>
+				</ol>
+			</li>
+		</ul>
+	</li>
+</ul>
+HTML;
+
+	const HTML_MUSIC_NO_TEMPLATE_NAMES = <<<HTML
+<!doctype html>
+<h1>Music library</h1>
+
+<ul>
+	<li data-template>
+		<h2 data-bind:text>Artist name</h2>
+		
+		<ul>
+			<li data-template>
+				<h3 data-bind:text>Album name</h3>
+				
+				<ol>
+					<li data-template data-bind:text>Track name</li>
+				</ol>
+			</li>
+		</ul>
+	</li>
+</ul>
+HTML;
+
+	const HTML_STUDENT_LIST = <<<HTML
+<!doctype html>
+<h1>List of students:</h1>
+<ul>
+	<li data-template>
+		<dl>
+			<dt>Student name</dt>
+			<dd class="name">{{firstName}} {{lastName}}</dd>
+			
+			<dt>Current modules</dt>
+			<dd class="modules">
+				<ul>
+					<li data-template data-bind:text>Module name</li>
+				</ul>		
+			</dd>
+		</dl>
+	</li>
+</ul>
+HTML;
+
+	const HTML_LANGUAGE = <<<HTML
+<!doctype html>
+<html data-bind:lang="language">
+<head>
+	<meta charset="utf-8" />
+	<title>Language test</title>
+</head>
+<body>
+	<h1>Just a simple language test</h1>
+	<p>Take a look at the "lang" attribute of the HTML element.</p>
+</body>
+</html>
+HTML;
+	const HTML_SEQUENCES = <<<HTML
+<!doctype html>
+<h1>Numerical sequences</h1>
+<ul>
+	<li data-template>
+		<h2 data-bind:text>Sequence name</h2>
+		
+		<ol>
+			<li data-template data-bind:text>0</li>		
+		</ol>	
+	</li>
+</ul>
+HTML;
+	const HTML_DATES = <<<HTML
+<!doctype html>
+<h1>Month starting days for each month this year:</h1>
+<ul>
+	<li data-template data-bind:text></li>
+</ul>
+HTML;
+
+	const HTML_TODO = <<<HTML
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+	<title>TODO LIST!</title>
+</head>
+<body>
+	<h1>TODO LIST!</h1>
+	<ul>
+		<li data-template data-bind:class=":completedAt completed">
+			<form method="post">
+				<input type="hidden" name="id" data-bind:value="@name" />
+				<input name="title" data-bind:value="@name" />
+				<button name="do" value="complete">Complete</button>
+				<button name="do" value="delete">Delete</button>
+			</form>
+		</li>
+	</ul>
+</body>
+</html>
+HTML;
+
+	const HTML_TODO_CUSTOM_ELEMENT = <<<HTML
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+	<title>TODO LIST!</title>
+</head>
+<body>
+	<h1>TODO LIST!</h1>
+	<todo-list />
+</body>
+</html>
+HTML;
+
+	const HTML_TODO_COMPONENT_TODO_LIST = <<<HTML
+<ul>
+	<todo-list-item data-template data-bind:class=":completedAt completed" />
+</ul>
+HTML;
+
+	const HTML_TODO_COMPONENT_TODO_LIST_ITEM = <<<HTML
+<li>
+	<form method="post">
+		<input type="hidden" name="id" data-bind:value="@name" />
+		<input name="title" data-bind:value="@name" />
+		<button name="do" value="complete">Complete</button>
+		<button name="do" value="delete">Delete</button>
+	</form>
+</li>
+HTML;
+
+	const HTML_GOOD_BAD = <<<HTML
+<!doctype html>
+<p>The following list of "good" and "bad" templates is intentionally formatted like this.</p>
+<p>There should be no whitespace, and therefore the template siblings must not include other template items.</p>
+<ul><li data-template="good"><i>GOOD</i> <span data-bind:text>Good message</span></li><li data-template="bad"><i>BAD</i> <span data-bind:text>Bad message</span></li></ul>
+HTML;
+
+	const HTML_PARTIAL_VIEW = <<<HTML
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8" />
+	<title data-bind:test="title">My website</title>
+</head>
+<body>
+	<header>
+		<h1>My website!</h1>
+	</header>
+	<main data-partial>
+		The page content will go in here.
+	</main>
+	<footer>
+		<p>Thank you for visiting!</p>
+	</footer>
+</body>
+</html>
+HTML;
+
+	const HTML_EXTENDS_PARTIAL_VIEW = <<<HTML
+<!-- 
+extends=base-page
+
+[vars]
+title=My website, extended... 
+-->
+<article>
+	<h1>Hello from within a sub-template!</h1>
+	<p>This piece of HTML should be placed within the appropriate template.</p>
+</article>
+<aside>
+	Some useful links can be put here.
+</aside>
+HTML;
+
+	const HTML_INCORRECTLY_EXTENDS_PARTIAL_VIEW = <<<HTML
+<article>
+	<h1>Hello from within a sub-template!</h1>
+	<p>This piece of HTML should be placed within the appropriate template.</p>
+</article>
+<!-- 
+extends=base-page
+
+[vars]
+title=My website, extended... 
+-->
+<aside>
+	Some useful links can be put here.
+</aside>
+HTML;
+
+	const HTML_EXTENDS_PARTIAL_VIEW_RECURSIVE = <<<HTML
+<!-- 
+extends=extended-page
+-->
+<title>This title was set in the inner partial view.</title>
+<div class="inner">
+	<p>This is an inner DIV element that will be placed into the "extended page" partial.</p>
+</div>
+HTML;
+
+	const HTML_EXTENDS_PARTIAL_VIEW_RECURSIVE_BASE = <<<HTML
+<!-- extends=partial-base -->
+<div class="outer">
+	<p>This is the outer DIV element that will be placed into the base partial view.</p>
+	<div data-partial></div>
+</div>
+HTML;
+
+	const HTML_COMMENT_WITHOUT_INI_DATA_PARTIAL_VIEW = <<<HTML
+<!-- 
+This is just a message to test ini parsing. 
+Oh yeah!
+-->
+<article>
+	<h1>Hello from within a sub-template!</h1>
+	<p>This piece of HTML should be placed within the appropriate template.</p>
+</article>
+<aside>
+	Some useful links can be put here.
+</aside>
+HTML;
+	const HTML_COMPONENT = <<<HTML
+<!doctype html>
+<h1>Component test</h1>
+<p>This test shows how a custom element can be injected into the document.</p>
+<custom-element />
+<p>If there's matching modular content in the _compnent directory, the above element will be filled with its content.</p>
+HTML;
+
+
+	public static function createHTML(string $html = ""):HTMLDocument {
+		return HTMLDocumentFactory::create($html);
+	}
+
+	public static function createXML(string $xml):XMLDocument {
+		return XMLDocumentFactory::create($xml);
+	}
+}