diff --git a/editions/clientserver/tiddlers/HelloThere.tid b/editions/clientserver/tiddlers/HelloThere.tid
new file mode 100644
index 000000000..76add9248
--- /dev/null
+++ b/editions/clientserver/tiddlers/HelloThere.tid
@@ -0,0 +1,4 @@
+title: HelloThere
+
+Experimental clientserver edition of TiddlyWiki5.
+
diff --git a/editions/clientserver/tiddlywiki.info b/editions/clientserver/tiddlywiki.info
new file mode 100644
index 000000000..fb33cbf44
--- /dev/null
+++ b/editions/clientserver/tiddlywiki.info
@@ -0,0 +1,6 @@
+{
+	"plugins": [
+		"tiddlywiki/tiddlyweb"
+	],
+	"parentWiki": "../tw5.com"
+}
\ No newline at end of file
diff --git a/editions/clientserver/wiki/DefaultTiddlers.tid b/editions/clientserver/wiki/DefaultTiddlers.tid
new file mode 100644
index 000000000..e1fa2939c
--- /dev/null
+++ b/editions/clientserver/wiki/DefaultTiddlers.tid
@@ -0,0 +1,7 @@
+title: $:/DefaultTiddlers
+
+HelloThere
+[[TiddlyWiki5 Editions]]
+Demos
+Improvements
+Docs
diff --git a/editions/clientserver/wiki/SiteSubtitle.tid b/editions/clientserver/wiki/SiteSubtitle.tid
new file mode 100644
index 000000000..256e89024
--- /dev/null
+++ b/editions/clientserver/wiki/SiteSubtitle.tid
@@ -0,0 +1,4 @@
+title: SiteSubtitle
+modifier: JeremyRuston
+
+a reusable non-linear personal web notebook
\ No newline at end of file
diff --git a/editions/clientserver/wiki/SiteTitle.tid b/editions/clientserver/wiki/SiteTitle.tid
new file mode 100644
index 000000000..5280b839a
--- /dev/null
+++ b/editions/clientserver/wiki/SiteTitle.tid
@@ -0,0 +1,4 @@
+title: SiteTitle
+modifier: JeremyRuston
+
+TiddlyWiki5
\ No newline at end of file
diff --git a/editions/clientserver/wiki/html-div-tiddler.tid b/editions/clientserver/wiki/html-div-tiddler.tid
new file mode 100644
index 000000000..ae5ec2a77
--- /dev/null
+++ b/editions/clientserver/wiki/html-div-tiddler.tid
@@ -0,0 +1,9 @@
+title: $:/core/templates/html-div-tiddler
+
+<!--
+
+This template is used for saving tiddlers as an HTML DIV tag with attributes representing the tiddler fields. This version includes the tiddler changecount as the field `revision`.
+
+-->`<div`<$fields exclude='text revision' template=' $name$="$encoded_value$"'></$fields>` revision="`<$info type='changecount'/>`">
+<pre>`<$view field="text" format="htmlencoded" />`</pre>
+</div>`
diff --git a/serve.sh b/serve.sh
index e09b02c37..8dabf2159 100755
--- a/serve.sh
+++ b/serve.sh
@@ -3,7 +3,7 @@
 # serve TiddlyWiki5 over HTTP
 
 node ./tiddlywiki.js \
-	editions/tw5.com \
+	editions/clientserver \
 	--verbose \
 	--server 8080 $:/core/templates/tiddlywiki5.template.html text/plain text/html \
 	|| exit 1