diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid
new file mode 100644
index 000000000..736bea91b
--- /dev/null
+++ b/core/wiki/macros/toc.tid
@@ -0,0 +1,46 @@
+title: $:/core/macros/toc
+tags: $:/tags/Macro
+
+\define toc(tag)
+<ol>
+<$list filter="[tag[$tag$]]">
+<li>
+<$link>
+<$view field="title"/>
+</$link>
+<$macrocall $name="toc" tag=<<currentTiddler>>/>
+</li>
+</$list>
+</ol>
+\end
+
+\define toc-body(tag,show-button-filter)
+<$set name="toc-state" value=<<qualify "$:/state/toc/$tag$-$(currentTiddler)$">>>
+<li>
+<$link>
+<$reveal type="nomatch" state=<<toc-state>> text="open">
+<$button set=<<toc-state>> setTo="open" class="btn-invisible">
+{{$:/core/images/right-arrow}}
+</$button>
+</$reveal>
+<$reveal type="match" state=<<toc-state>> text="open">
+<$button set=<<toc-state>> setTo="close" class="btn-invisible">
+{{$:/core/images/down-arrow}}
+</$button>
+</$reveal>
+<$view field="title"/>
+</$link>
+<$reveal type="match" state=<<toc-state>> text="open">
+<$macrocall $name="toc-expandable" tag=<<currentTiddler>>/>
+</$reveal>
+</li>
+</$set>
+\end
+
+\define toc-expandable(tag)
+<ol>
+<$list filter="[tag[$tag$]]">
+<<toc-body tag:"$tag$">>
+</$list>
+</ol>
+\end
diff --git a/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid b/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
new file mode 100644
index 000000000..38625ebaa
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid
@@ -0,0 +1,33 @@
+title: TableOfContentsMacro
+tags: macros
+modified: 20140818180307785
+
+The table of contents macro produces a hierarchical tree of tiddlers based on their tags.
+
+There are several variants of the macro:
+
+* `<<toc>>` produces a simple hierarchical tree of links
+* `<<toc-expandable>>` produces an expandable tree of links
+
+! Parameters
+
+|!Position |!Name |!Description |!Default |
+|1st |tag |The tag that identifies the top level of the hierarchy | |
+
+! Examples
+
+!! Simple Table of Contents
+
+<$macrocall $name="wikitext-example-without-html"
+src="<div class='tw-table-of-contents'>
+<<toc 'Contents'>>
+</div>
+"/>
+
+!! Expandable Table of Contents
+
+<$macrocall $name="wikitext-example-without-html"
+src="<div class='tw-table-of-contents'>
+<<toc-expandable 'Contents'>>
+</div>
+"/>
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/First.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/First.tid
new file mode 100644
index 000000000..f48ff0815
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/First.tid
@@ -0,0 +1,4 @@
+title: First
+tags: Contents
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/FirstOne.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/FirstOne.tid
new file mode 100644
index 000000000..238aeda27
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/FirstOne.tid
@@ -0,0 +1,4 @@
+title: FirstOne
+tags: First
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/FirstThree.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/FirstThree.tid
new file mode 100644
index 000000000..4a5fcb683
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/FirstThree.tid
@@ -0,0 +1,4 @@
+title: FirstThree
+tags: First
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/FirstTwo.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/FirstTwo.tid
new file mode 100644
index 000000000..a30891722
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/FirstTwo.tid
@@ -0,0 +1,4 @@
+title: FirstTwo
+tags: First
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/Fourth.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/Fourth.tid
new file mode 100644
index 000000000..a09fe0467
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/Fourth.tid
@@ -0,0 +1,4 @@
+title: Fourth
+tags: Contents
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/Second.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/Second.tid
new file mode 100644
index 000000000..c87c88a7a
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/Second.tid
@@ -0,0 +1,4 @@
+title: Second
+tags: Contents
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondOne.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondOne.tid
new file mode 100644
index 000000000..2d9898b33
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondOne.tid
@@ -0,0 +1,4 @@
+title: SecondOne
+tags: Second
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThree.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThree.tid
new file mode 100644
index 000000000..f87e1ac09
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThree.tid
@@ -0,0 +1,4 @@
+title: SecondThree
+tags: Second
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeOne.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeOne.tid
new file mode 100644
index 000000000..22d2e83c9
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeOne.tid
@@ -0,0 +1,4 @@
+title: SecondThreeOne
+tags: SecondThree
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeThree.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeThree.tid
new file mode 100644
index 000000000..7b632ad4b
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeThree.tid
@@ -0,0 +1,4 @@
+title: SecondThreeThree
+tags: SecondThree
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeTwo.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeTwo.tid
new file mode 100644
index 000000000..4578ff7d0
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondThreeTwo.tid
@@ -0,0 +1,4 @@
+title: SecondThreeTwo
+tags: SecondThree
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/SecondTwo.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondTwo.tid
new file mode 100644
index 000000000..302838c89
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/SecondTwo.tid
@@ -0,0 +1,4 @@
+title: SecondTwo
+tags: Second
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/Third.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/Third.tid
new file mode 100644
index 000000000..6b2c4db1d
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/Third.tid
@@ -0,0 +1,4 @@
+title: Third
+tags: Contents
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdOne.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdOne.tid
new file mode 100644
index 000000000..e090c269f
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdOne.tid
@@ -0,0 +1,4 @@
+title: ThirdOne
+tags: Third
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdThree.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdThree.tid
new file mode 100644
index 000000000..ec781f15f
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdThree.tid
@@ -0,0 +1,4 @@
+title: ThirdThree
+tags: Third
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdTwo.tid b/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdTwo.tid
new file mode 100644
index 000000000..cbbdb7aab
--- /dev/null
+++ b/editions/tw5.com/tiddlers/samples/TableOfContents/ThirdTwo.tid
@@ -0,0 +1,4 @@
+title: ThirdTwo
+tags: Third
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file