diff --git a/content/maintenance/_index.md b/content/maintenance/_index.md
index 3ad3d3863..691a5d47c 100644
--- a/content/maintenance/_index.md
+++ b/content/maintenance/_index.md
@@ -1,9 +1,12 @@
 ---
-title: Documentation Maintenance Lists
+title: Maintenance
 description: Some lists useful for the maintenance of the Hugo docs site.
 date: 2018-02-09
 categories: [maintenance]
 keywords: [maintenance]
+menu:
+  docs:
+    weight: 200
 slug:
 aliases: []
 toc: true
diff --git a/layouts/maintenance/list.html b/layouts/maintenance/list.html
index 0cfc7302e..b0f9008c9 100644
--- a/layouts/maintenance/list.html
+++ b/layouts/maintenance/list.html
@@ -7,17 +7,29 @@
                 <ul>
                     <li><a href="#last-updated">Last Updated</a></li>
                     <li><a href="#least-recently-updated">Least Recently Updated</a></li>
+                     <li><a href="#todos">Pages marked with TODO</a></li>
                 </ul>
             </aside>
         </div>
         <div class="w-100">
             {{ $byLastMod :=  .Site.RegularPages.ByLastmod  }}
             {{ $recent := ($byLastMod | last 10).Reverse }}
-            {{ $leastRecent := $byLastMod | first 10 }}
+            {{ $leastRecent := $byLastMod | first 10 }}            
             <h2 id="last-updated">Last Updated</h2>
             {{ partial "maintenance-pages-table" $recent }}
             <h2 id="least-recently-updated">Least Recently Updated</h2>
             {{ partial "maintenance-pages-table" $leastRecent }}
+
+            {{/* Don't think this is possible with where directly. Should investigate. */}}
+            {{ .Scratch.Set "todos" slice }}
+            {{ range .Site.RegularPages }}
+                 {{ if .HasShortcode "todo" }}
+                 {{ $.Scratch.Add "todos" . }}
+                 {{ end }}
+            {{ end }}
+            <h2 id="todos">Pages marked with TODO</h2>
+            {{ partial "maintenance-pages-table" (.Scratch.Get "todos") }}
+
         </div>
     </div>
 </div>