diff --git a/content/works.md b/content/works.md
index 2bea73e..126adbc 100644
--- a/content/works.md
+++ b/content/works.md
@@ -4,4 +4,4 @@ layout: single
 aliases: [stories]
 ---
 
-{{< works >}}
+{{< works corpus="works" collections="collections" creators="creators" >}}
diff --git a/layouts/partials/nav.html b/layouts/_partials/nav.html
similarity index 100%
rename from layouts/partials/nav.html
rename to layouts/_partials/nav.html
diff --git a/layouts/partials/title/full.html b/layouts/_partials/title/full.html
similarity index 100%
rename from layouts/partials/title/full.html
rename to layouts/_partials/title/full.html
diff --git a/layouts/_partials/work.html b/layouts/_partials/work.html
new file mode 100644
index 0000000..da2c30e
--- /dev/null
+++ b/layouts/_partials/work.html
@@ -0,0 +1,36 @@
+{{- $work := .work }}
+{{- $works := .works }}
+{{- $creators := .creators }}
+{{- /* This is really ugly, but alas, it is precisely what we need. */ -}}
+<dt><a href="{{ $work.url }}">{{ $work.title }}</a> <span class="author">by 
+    {{ range $k, $author := $work.authors }}
+        {{- if index $creators $author }}<a href="{{ index $creators $author }}" target="_blank">{{ $author | markdownify }}</a>{{ else }}{{ $author | markdownify }}{{ end }}
+        {{- if ne (add $k 1) ($work.authors | len) }}, {{ end }}
+    {{- end }}
+    {{- range $contributor := $work.contributors }},
+        {{ if index $creators $contributor }}<a href="{{ index $creators $contributor }}" target="_blank">{{ $contributor | markdownify }}</a>{{ else }}{{ $contributor | markdownify }}{{ end }}
+        <small>(contributor)</small>
+    {{- end }}    
+</span></dt>
+<dd>
+{{ $work.description | markdownify }}
+<ul class="meta">
+    {{- if $work.type }}<li><em>Type:</em> {{ $work.type }}</li>{{- end }}
+    <li><em>Characters and dates:</em>
+        {{- range $k, $v := $work.years }}
+            {{ index $work.characters $k }} — {{ $v }}
+            {{- if ne (add $k 1) ($work.years | len) }}, {{- end }}
+        {{- end }}</li>
+    {{- if $work.cw }}<li><em>CWs:</em> {{ $work.cw }}</li>{{- end }}
+    {{- if $work.spoilers }}<li><em>Spoilers:</em> {{ $work.spoilers | markdownify }}</li>{{- end }}
+</ul>
+{{- $subworks := where $works "parent" "eq" $work.title }}
+{{- if gt (len $subworks) 0 }}
+    <h3>Associated works</h3>
+    <dl>
+    {{- range $subwork := where $works "parent" "eq" $work.title }}
+        {{ partial "work.html" (dict "work" $subwork "works" $works "creators" $creators) }}
+    {{- end }}
+    </dl>
+{{- end }}
+</dd>
diff --git a/layouts/_shortcodes/works.html b/layouts/_shortcodes/works.html
index 94098c8..2a823cd 100644
--- a/layouts/_shortcodes/works.html
+++ b/layouts/_shortcodes/works.html
@@ -1,128 +1,22 @@
-{{- with hugo.Data.works }}
-{{- $works := . }}
+{{- $works := index hugo.Data (.Get "corpus") }}
+{{- $collections := index hugo.Data (.Get "collections") }}
+{{- $creators := index hugo.Data (.Get "creators") }}
 <section class="works">
 
     <dl>
         {{- range $work := sort (where (where $works "collection" nil) "parent" nil) "title" "asc" }}
-        <dt><a href="{{ $work.url }}">{{ $work.title }}</a> <span class="author">by 
-                {{ range $k, $author := $work.authors }}
-                {{- if index hugo.Data.creators $author }}<a href="{{ index hugo.Data.creators $author }}" target="_blank">{{ $author | markdownify }}</a>{{ else }}{{ $author | markdownify }}{{ end }}
-                {{- if ne (add $k 1) ($work.authors | len) }}, {{ end }}
-                {{- end }}
-                {{- range $contributor := $work.contributors }},
-                {{ if index hugo.Data.creators $contributor }}<a href="{{ index hugo.Data.creators $contributor }}" target="_blank">{{ $contributor | markdownify }}</a>{{ else }}{{ $contributor | markdownify }}{{ end }}
-                <small>(contributor)</small>
-                {{- end }}    
-            </span></dt>
-        <dd>
-            {{ $work.description | markdownify }}
-            <ul class="meta">
-                <li><em>Type:</em> {{ $work.type }}</li>
-                <li><em>Characters and dates:</em>
-                    {{- range $k, $v := $work.years }}
-                    {{ index $work.characters $k }} — {{ $v }}
-                    {{- if ne (add $k 1) ($work.years | len) }}, {{- end }}
-                    {{- end }}</li>
-                {{- if $work.cw }}<li><em>CWs:</em> {{ $work.cw }}</li>{{- end }}
-                {{- if $work.spoilers }}<li><em>Spoilers:</em> {{ $work.spoilers | markdownify }}</li>{{- end }}
-            </ul>
-            {{- $subworks := where $works "parent" "eq" $work.title }}
-            {{- if gt (len $subworks) 0 }}
-                <h3>Associated works</h3>
-                <dl>
-                {{- range $subwork := where $works "parent" "eq" $work.title }}
-                    <dt><a href="{{ $subwork.url }}">{{ $subwork.title }}</a> <span class="author">by
-                            {{ range $k, $author := $subwork.authors }}
-                            {{- if index hugo.Data.creators $author }}<a href="{{ index hugo.Data.creators $author }}" target="_blank">{{ $author | markdownify }}</a>{{ else }}{{ $author | markdownify }}{{ end }}
-                            {{- if ne (add $k 1) ($work.authors | len) }}, {{ end }}
-                            {{- end }}
-                            {{- range $contributor := $subwork.contributors }},
-                            {{ if index hugo.Data.creators $contributor }}<a href="{{ index hugo.Data.creators $contributor }}" target="_blank">{{ $contributor | markdownify }}</a>{{ else }}{{ $contributor | markdownify }}{{ end }}
-                            <small>(contributor)</small>
-                            {{- end }}
-                        </span></dt>
-                    <dd>
-                        {{ $subwork.description | markdownify }}
-                        <ul class="meta">
-                            <li><em>Type:</em> {{ $subwork.type }}</li>
-                            <li><em>Characters and dates:</em> <ul>
-                                {{- range $k, $v := $subwork.years }}
-                                <li>{{ index $subwork.characters $k }} — {{ $v }}</li>
-                                {{- end }}
-                            </ul></li>
-                            {{- if $subwork.cw }}<li><em>CWs:</em> {{ $subwork.cw }}</li>{{- end }}
-                            {{- if $subwork.spoilers }}<li><em>Spoilers:</em> {{ $subwork.spoilers | markdownify }}</li>{{- end }}
-                        </ul>
-                    </dd>
-                {{- end }}
-                </dl>
-            {{- end }}
-        </dd>
+        {{ partial "work.html" (dict "work" $work "works" $works "creators" $creators) }}
         {{- end }}
     </dl>
 
-    {{- range $collection := hugo.Data.collections }}
+    {{- range $collection := $collections }}
     <h2>{{ $collection.title }}</h2>
 
     <dl>
         {{- range $work := where $works "collection" $collection.id }}
-        <dt><a href="{{ $work.url }}">{{ $work.title }}</a> <span class="author">by 
-                {{ range $k, $author := $work.authors }}
-                {{- if index hugo.Data.creators $author }}<a href="{{ index hugo.Data.creators $author }}" target="_blank">{{ $author | markdownify }}</a>{{ else }}{{ $author | markdownify }}{{ end }}
-                {{- if ne (add $k 1) ($work.authors | len) }}, {{ end }}
-                {{- end }}
-                {{- range $contributor := $work.contributors }},
-                {{ if index hugo.Data.creators $contributor }}<a href="{{ index hugo.Data.creators $contributor }}" target="_blank">{{ $contributor | markdownify }}</a>{{ else }}{{ $contributor | markdownify }}{{ end }}
-                <small>(contributor)</small>
-                {{- end }}    
-            </span></dt>
-        <dd>
-            {{ $work.description | markdownify }}
-            <ul class="meta">
-                <li><em>Type:</em> {{ $work.type }}</li>
-                <li><em>Characters and dates:</em>
-                    {{- range $k, $v := $work.years }}
-                    {{ index $work.characters $k }} — {{ $v }}
-                    {{- if ne (add $k 1) ($work.years | len) }}, {{- end }}
-                    {{- end }}</li>
-                {{- if $work.cw }}<li><em>CWs:</em> {{ $work.cw }}</li>{{- end }}
-                {{- if $work.spoilers }}<li><em>Spoilers:</em> {{ $work.spoilers | markdownify }}</li>{{- end }}
-            </ul>
-            {{- $subworks := where $works "parent" "eq" $work.title }}
-            {{- if gt (len $subworks) 0 }}
-                <h3>Associated works</h3>
-                <dl>
-                {{- range $subwork := where $works "parent" "eq" $work.title }}
-                    <dt><a href="{{ $subwork.url }}">{{ $subwork.title }}</a> <span class="author">by
-                            {{ range $k, $author := $subwork.authors }}
-                            {{- if index hugo.Data.creators $author }}<a href="{{ index hugo.Data.creators $author }}" target="_blank">{{ $author | markdownify }}</a>{{ else }}{{ $author | markdownify }}{{ end }}
-                            {{- if ne (add $k 1) ($work.authors | len) }}, {{ end }}
-                            {{- end }}
-                            {{- range $contributor := $subwork.contributors }},
-                            {{ if index hugo.Data.creators $contributor }}<a href="{{ index hugo.Data.creators $contributor }}" target="_blank">{{ $contributor | markdownify }}</a>{{ else }}{{ $contributor | markdownify }}{{ end }}
-                            <small>(contributor)</small>
-                            {{- end }}
-                        </span></dt>
-                    <dd>
-                        {{ $subwork.description | markdownify }}
-                        <ul class="meta">
-                            <li><em>Type:</em> {{ $subwork.type }}</li>
-                            <li><em>Characters and dates:</em> <ul>
-                                {{- range $k, $v := $subwork.years }}
-                                <li>{{ index $subwork.characters $k }} — {{ $v }}</li>
-                                {{- end }}
-                            </ul></li>
-                            {{- if $subwork.cw }}<li><em>CWs:</em> {{ $subwork.cw }}</li>{{- end }}
-                            {{- if $subwork.spoilers }}<li><em>Spoilers:</em> {{ $subwork.spoilers | markdownify }}</li>{{- end }}
-                        </ul>
-                    </dd>
-                {{- end }}
-                </dl>
-            {{- end }}
-        </dd>
+        {{ partial "work.html" (dict "work" $work "works" $works "creators" $creators) }}
         {{- end }}
     </dl>
     {{- end }}
 
 </section>
-{{- end }}