diff --git a/doc/todo/optimisations.mdwn b/doc/todo/optimisations.mdwn
new file mode 100644
index 000000000..4cf0907f5
--- /dev/null
+++ b/doc/todo/optimisations.mdwn
@@ -0,0 +1,16 @@
+* Render each changed page only once. Currently pages are rendered up to 4
+  times in worst case (8 times if there's an rss feed).
+
+  The issue is that rendering a page is used to gather info like the links
+  on the page that can effect rendering other pages. So it needs a
+  multi-pass system. But rendering the whole page in each pass is rather
+  obscene.
+
+* Don't render blog archive pages unless a page is added/removed. Just
+  changing a page doesn't affect the archives as they show only the title.
+
+* Look at breaking the relatively rarely used blogging stuff out of
+  Render.pm, into its own module.
+
+* Look at splitting up CGI.pm. But note that too much splitting can slow
+  perl down.
diff --git a/doc/todo/terminalclient.mdwn b/doc/todo/terminalclient.mdwn
new file mode 100644
index 000000000..454c35563
--- /dev/null
+++ b/doc/todo/terminalclient.mdwn
@@ -0,0 +1,3 @@
+Hack together a local ikiwiki w/o a web server using w3m's cgi-less mode
+and $EDITOR. Browse around a wiki, select pages to edit and get dropped
+right into the editor and have the page committed to svn automatically.