diff --git a/archives/2024.mdwn b/archives/2024.mdwn
new file mode 100644
index 0000000..a3c0cdb
--- /dev/null
+++ b/archives/2024.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2024 pages="page(posts/*) and !*/Discussion"]]
diff --git a/archives/2024/01.mdwn b/archives/2024/01.mdwn
new file mode 100644
index 0000000..eabfb74
--- /dev/null
+++ b/archives/2024/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/02.mdwn b/archives/2024/02.mdwn
new file mode 100644
index 0000000..521c690
--- /dev/null
+++ b/archives/2024/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/03.mdwn b/archives/2024/03.mdwn
new file mode 100644
index 0000000..023d9e7
--- /dev/null
+++ b/archives/2024/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/04.mdwn b/archives/2024/04.mdwn
new file mode 100644
index 0000000..89ac372
--- /dev/null
+++ b/archives/2024/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/05.mdwn b/archives/2024/05.mdwn
new file mode 100644
index 0000000..82fa0bc
--- /dev/null
+++ b/archives/2024/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/06.mdwn b/archives/2024/06.mdwn
new file mode 100644
index 0000000..2f0d34a
--- /dev/null
+++ b/archives/2024/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/07.mdwn b/archives/2024/07.mdwn
new file mode 100644
index 0000000..e40a494
--- /dev/null
+++ b/archives/2024/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/08.mdwn b/archives/2024/08.mdwn
new file mode 100644
index 0000000..d59e39f
--- /dev/null
+++ b/archives/2024/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/09.mdwn b/archives/2024/09.mdwn
new file mode 100644
index 0000000..0231a47
--- /dev/null
+++ b/archives/2024/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/10.mdwn b/archives/2024/10.mdwn
new file mode 100644
index 0000000..2b17404
--- /dev/null
+++ b/archives/2024/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/11.mdwn b/archives/2024/11.mdwn
new file mode 100644
index 0000000..a1beafa
--- /dev/null
+++ b/archives/2024/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/12.mdwn b/archives/2024/12.mdwn
new file mode 100644
index 0000000..65adbba
--- /dev/null
+++ b/archives/2024/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2024 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2024) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]

diff --git a/archives/2023.mdwn b/archives/2023.mdwn
new file mode 100644
index 0000000..cd03157
--- /dev/null
+++ b/archives/2023.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2023 pages="page(posts/*) and !*/Discussion"]]
diff --git a/archives/2023/01.mdwn b/archives/2023/01.mdwn
new file mode 100644
index 0000000..c2ed2a1
--- /dev/null
+++ b/archives/2023/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/02.mdwn b/archives/2023/02.mdwn
new file mode 100644
index 0000000..428672c
--- /dev/null
+++ b/archives/2023/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/03.mdwn b/archives/2023/03.mdwn
new file mode 100644
index 0000000..3286b48
--- /dev/null
+++ b/archives/2023/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/04.mdwn b/archives/2023/04.mdwn
new file mode 100644
index 0000000..4a82af2
--- /dev/null
+++ b/archives/2023/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/05.mdwn b/archives/2023/05.mdwn
new file mode 100644
index 0000000..51b064e
--- /dev/null
+++ b/archives/2023/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/06.mdwn b/archives/2023/06.mdwn
new file mode 100644
index 0000000..7454b86
--- /dev/null
+++ b/archives/2023/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/07.mdwn b/archives/2023/07.mdwn
new file mode 100644
index 0000000..ff45784
--- /dev/null
+++ b/archives/2023/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/08.mdwn b/archives/2023/08.mdwn
new file mode 100644
index 0000000..a4ac30d
--- /dev/null
+++ b/archives/2023/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/09.mdwn b/archives/2023/09.mdwn
new file mode 100644
index 0000000..b58593a
--- /dev/null
+++ b/archives/2023/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/10.mdwn b/archives/2023/10.mdwn
new file mode 100644
index 0000000..2a342da
--- /dev/null
+++ b/archives/2023/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/11.mdwn b/archives/2023/11.mdwn
new file mode 100644
index 0000000..7c1a244
--- /dev/null
+++ b/archives/2023/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/12.mdwn b/archives/2023/12.mdwn
new file mode 100644
index 0000000..66d5788
--- /dev/null
+++ b/archives/2023/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2023 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2023) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]

diff --git a/posts/I_miss_you_ikiwiki.mdwn b/posts/I_miss_you_ikiwiki.mdwn
index a06ad73..8c9f397 100644
--- a/posts/I_miss_you_ikiwiki.mdwn
+++ b/posts/I_miss_you_ikiwiki.mdwn
@@ -1 +1,3 @@
 Hello 👋
+
+I used ikiwiki for a while. It's still one of the best static site generators out there and was a static site generator before we all knew what one of those was. Dynamic admin and static serving. Perfect! Not sure if I can still use it though. Thought I'd fire up one on branchable again to play with.

diff --git a/posts/first_post.mdwn b/posts/I_miss_you_ikiwiki.mdwn
similarity index 100%
rename from posts/first_post.mdwn
rename to posts/I_miss_you_ikiwiki.mdwn

diff --git a/posts/second_post.mdwn b/posts/second_post.mdwn
deleted file mode 100644
index 5cc6c38..0000000
--- a/posts/second_post.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-This is the second post to this example blog. To add new posts, just add files to the posts/ subdirectory, or use the web form.

diff --git a/posts/first_post.mdwn b/posts/first_post.mdwn
index bd4c803..a06ad73 100644
--- a/posts/first_post.mdwn
+++ b/posts/first_post.mdwn
@@ -1 +1 @@
-This is my first post.
+Hello 👋

diff --git a/archives/2022.mdwn b/archives/2022.mdwn
new file mode 100644
index 0000000..e738afc
--- /dev/null
+++ b/archives/2022.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2022 pages="page(posts/*) and !*/Discussion"]]
diff --git a/archives/2022/01.mdwn b/archives/2022/01.mdwn
new file mode 100644
index 0000000..b3ff765
--- /dev/null
+++ b/archives/2022/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/02.mdwn b/archives/2022/02.mdwn
new file mode 100644
index 0000000..9e109ab
--- /dev/null
+++ b/archives/2022/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/03.mdwn b/archives/2022/03.mdwn
new file mode 100644
index 0000000..4ff2fa6
--- /dev/null
+++ b/archives/2022/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/04.mdwn b/archives/2022/04.mdwn
new file mode 100644
index 0000000..04cada7
--- /dev/null
+++ b/archives/2022/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/05.mdwn b/archives/2022/05.mdwn
new file mode 100644
index 0000000..7a02820
--- /dev/null
+++ b/archives/2022/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/06.mdwn b/archives/2022/06.mdwn
new file mode 100644
index 0000000..0c2ff58
--- /dev/null
+++ b/archives/2022/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/07.mdwn b/archives/2022/07.mdwn
new file mode 100644
index 0000000..098c5b8
--- /dev/null
+++ b/archives/2022/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/08.mdwn b/archives/2022/08.mdwn
new file mode 100644
index 0000000..2151608
--- /dev/null
+++ b/archives/2022/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/09.mdwn b/archives/2022/09.mdwn
new file mode 100644
index 0000000..2f250b3
--- /dev/null
+++ b/archives/2022/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/10.mdwn b/archives/2022/10.mdwn
new file mode 100644
index 0000000..3584fc0
--- /dev/null
+++ b/archives/2022/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/11.mdwn b/archives/2022/11.mdwn
new file mode 100644
index 0000000..f883931
--- /dev/null
+++ b/archives/2022/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/12.mdwn b/archives/2022/12.mdwn
new file mode 100644
index 0000000..7d49307
--- /dev/null
+++ b/archives/2022/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2022 pages="page(posts/*) and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2022) and page(posts/*) and !*/Discussion" show=0 feeds=no reverse=yes]]

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eecda60
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.ikiwiki
diff --git a/archives.mdwn b/archives.mdwn
new file mode 100644
index 0000000..d07b73b
--- /dev/null
+++ b/archives.mdwn
@@ -0,0 +1,8 @@
+[[!if test="archives/*" then="""
+Browse through blog archives by year:
+[[!map pages="./archives/* and !./archives/*/* and !*/Discussion"]]
+"""
+else="""
+You need to use the `ikiwiki-calendar` program to generate calendar-based
+archive pages.
+"""]]
diff --git a/comments.mdwn b/comments.mdwn
new file mode 100644
index 0000000..e22b50a
--- /dev/null
+++ b/comments.mdwn
@@ -0,0 +1,10 @@
+[[!sidebar content="""
+[[!inline pages="comment_pending(./posts/*)" feedfile=pendingmoderation
+description="comments pending moderation" show=-1]]
+Comments in the [[!commentmoderation desc="moderation queue"]]:
+[[!pagecount pages="comment_pending(./posts/*)"]]
+"""]]
+
+Recent comments on posts in the [[blog|index]]:
+[[!inline pages="./posts/*/Discussion or comment(./posts/*)"
+template="comment"]]
diff --git a/index.mdwn b/index.mdwn
new file mode 100644
index 0000000..d08446d
--- /dev/null
+++ b/index.mdwn
@@ -0,0 +1,8 @@
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
+
+[[!inline pages="page(./posts/*) and !*/Discussion" show="10"
+actions=yes rootpage="posts"]]
diff --git a/posts.mdwn b/posts.mdwn
new file mode 100644
index 0000000..2bd0f1d
--- /dev/null
+++ b/posts.mdwn
@@ -0,0 +1,3 @@
+Here is a full list of posts to the [[blog|index]].
+
+[[!inline pages="page(./posts/*) and !*/Discussion" archive=yes feedshow=10 quick=yes trail=yes]]
diff --git a/posts/first_post.mdwn b/posts/first_post.mdwn
new file mode 100644
index 0000000..bd4c803
--- /dev/null
+++ b/posts/first_post.mdwn
@@ -0,0 +1 @@
+This is my first post.
diff --git a/posts/second_post.mdwn b/posts/second_post.mdwn
new file mode 100644
index 0000000..5cc6c38
--- /dev/null
+++ b/posts/second_post.mdwn
@@ -0,0 +1 @@
+This is the second post to this example blog. To add new posts, just add files to the posts/ subdirectory, or use the web form.
diff --git a/sidebar.mdwn b/sidebar.mdwn
new file mode 100644
index 0000000..e0895f6
--- /dev/null
+++ b/sidebar.mdwn
@@ -0,0 +1,10 @@
+[[!if test="enabled(calendar)" then="""
+[[!calendar pages="page(./posts/*) and !*/Discussion"]]
+"""]]
+
+[[Recent Comments|comments]]
+
+[[Archives]]
+
+[[Tags]]:
+[[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
diff --git a/tags.mdwn b/tags.mdwn
new file mode 100644
index 0000000..b5eca5b
--- /dev/null
+++ b/tags.mdwn
@@ -0,0 +1,3 @@
+[[!pagestats pages="./tags/*" among="./posts/*"]]
+
+On the right you can see the tag cloud for this blog.