diff --git a/.obsidian-git-data b/.obsidian-git-data
index 1345c7801..c48ea9079 100644
--- a/.obsidian-git-data
+++ b/.obsidian-git-data
@@ -1,2 +1,8 @@
+Mon Jul 05 2021 22:32:20 GMT+0200 (Central European Summer Time)
+Mon Jul 05 2021 22:32:20 GMT+0200 (Central European Summer Time)
 Mon Jul 05 2021 17:42:20 GMT+0200 (Central European Summer Time)
-Mon Jul 05 2021 17:42:20 GMT+0200 (Central European Summer Time)
\ No newline at end of file
+=======
+Mon Jul 05 2021 01:04:00 GMT+0200 (Central European Summer Time)
+Mon Jul 05 2021 01:03:00 GMT+0200 (Central European Summer Time)
+Sat Jul 03 2021 13:05:07 GMT+0200 (Central European Summer Time)
+>>>>>>> 32f2963de50e36ac5299026bb881ee68667fcdc6
diff --git a/.obsidian/config b/.obsidian/config
index 84501e3da..520427bed 100644
--- a/.obsidian/config
+++ b/.obsidian/config
@@ -1 +1 @@
-{"pluginEnabledStatus":{"file-explorer":true,"global-search":true,"switcher":true,"graph":true,"backlink":true,"command-palette":true,"markdown-importer":true,"word-count":true,"open-with-default-app":true,"file-recovery":true,"daily-notes":true,"templates":true,"random-note":true,"outline":true,"audio-recorder":true,"starred":true,"page-preview":true,"tag-pane":false,"workspaces":true},"vimMode":true,"strictLineBreaks":false,"enabledPlugins":["nldates-obsidian","obsidian-git","maximise-active-pane-obsidian"],"hotkeys":{"daily-notes":[{"modifiers":["Alt"],"key":"D"}],"daily-notes:goto-prev":[{"modifiers":["Alt"],"key":"Y"}],"daily-notes:goto-next":[{"modifiers":["Alt"],"key":"T"}],"editor:focus-top":[{"modifiers":["Alt","Mod"],"key":"K"}],"editor:focus-bottom":[{"modifiers":["Alt","Mod"],"key":"J"}],"editor:focus-left":[{"modifiers":["Alt","Mod"],"key":"H"}],"editor:focus-right":[{"modifiers":["Alt","Mod"],"key":"L"}],"insert-template":[{"modifiers":["Alt","Mod"],"key":"T"}],"backlink:open-backlinks":[{"modifiers":["Alt","Mod"],"key":"B"}],"random-note":[{"modifiers":["Alt","Mod"],"key":"R"}],"workspace:split-horizontal":[{"modifiers":["Alt","Mod"],"key":"-"}],"workspace:split-vertical":[{"modifiers":["Alt","Mod"],"key":"\\"}],"audio-recorder:start":[{"modifiers":["Alt","Mod"],"key":"A"}],"audio-recorder:stop":[{"modifiers":["Alt","Mod"],"key":"Q"}],"workspace:toggle-pin":[{"modifiers":["Alt","Mod"],"key":"P"}],"editor:open-link-in-new-leaf":[{"modifiers":["Mod"],"key":"]"}],"workspace:close":[{"modifiers":["Alt","Mod"],"key":"W"}],"file-explorer:reveal-active-file":[{"modifiers":["Alt","Mod"],"key":"N"}],"obsidian-git:push":[{"modifiers":["Mod","Shift"],"key":"A"}],"workspaces:save-and-load":[{"modifiers":["Mod","Shift"],"key":"S"}],"workspaces:open-modal":[{"modifiers":["Mod","Shift"],"key":"W"}],"workspaces:load":[{"modifiers":["Mod","Shift"],"key":"L"}]},"baseFontSize":15}
\ No newline at end of file
+{"pluginEnabledStatus":{"file-explorer":true,"global-search":true,"switcher":true,"graph":false,"backlink":false,"command-palette":false,"markdown-importer":false,"word-count":false,"open-with-default-app":false,"file-recovery":false,"daily-notes":true,"templates":false,"random-note":false,"outline":false,"audio-recorder":false,"starred":false,"page-preview":false,"tag-pane":false,"workspaces":false},"vimMode":true,"strictLineBreaks":false,"enabledPlugins":["obsidian-git","obsidian-outliner","sliding-panes-obsidian"],"hotkeys":{"daily-notes":[{"modifiers":["Alt"],"key":"D"}],"daily-notes:goto-prev":[{"modifiers":["Alt"],"key":"Y"}],"daily-notes:goto-next":[{"modifiers":["Alt"],"key":"T"}],"editor:focus-top":[{"modifiers":["Alt","Mod"],"key":"K"}],"editor:focus-bottom":[{"modifiers":["Alt","Mod"],"key":"J"}],"editor:focus-left":[{"modifiers":["Alt","Mod"],"key":"H"}],"editor:focus-right":[{"modifiers":["Alt","Mod"],"key":"L"}],"insert-template":[{"modifiers":["Alt","Mod"],"key":"T"}],"backlink:open-backlinks":[{"modifiers":["Alt","Mod"],"key":"B"}],"random-note":[{"modifiers":["Alt","Mod"],"key":"R"}],"workspace:split-horizontal":[{"modifiers":["Alt","Mod"],"key":"-"}],"workspace:split-vertical":[{"modifiers":["Alt","Mod"],"key":"\\"}],"audio-recorder:start":[{"modifiers":["Alt","Mod"],"key":"A"}],"audio-recorder:stop":[{"modifiers":["Alt","Mod"],"key":"Q"}],"workspace:toggle-pin":[{"modifiers":["Alt","Mod"],"key":"P"}],"editor:open-link-in-new-leaf":[{"modifiers":["Mod"],"key":"]"}],"workspace:close":[{"modifiers":["Alt","Mod"],"key":"W"}],"file-explorer:reveal-active-file":[{"modifiers":["Alt","Mod"],"key":"N"}],"obsidian-git:push":[{"modifiers":["Mod","Shift"],"key":"A"}],"workspaces:save-and-load":[{"modifiers":["Mod","Shift"],"key":"S"}],"workspaces:open-modal":[{"modifiers":["Mod","Shift"],"key":"W"}],"workspaces:load":[{"modifiers":["Mod","Shift"],"key":"L"}],"backlink:open":[{"modifiers":["Mod","Shift"],"key":"B"}],"graph:open-local":[{"modifiers":["Mod","Shift"],"key":"G"}],"app:toggle-default-new-pane-mode":[{"modifiers":["Mod","Shift"],"key":"P"}]},"baseFontSize":15,"defaultViewMode":"source"}
\ No newline at end of file
diff --git a/.obsidian/workspace b/.obsidian/workspace
index f6b5e5470..2ebdf9834 100644
--- a/.obsidian/workspace
+++ b/.obsidian/workspace
@@ -4,59 +4,91 @@
     "type": "split",
     "children": [
       {
-        "id": "32ac6e1822cb86d7",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "2021-07-05.md",
-            "mode": "source"
+        "id": "0c89ff652c39414e",
+        "type": "split",
+        "children": [
+          {
+            "id": "32ac6e1822cb86d7",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "2021-07-05.md",
+                "mode": "source"
+              }
+            }
+          },
+          {
+            "id": "63f809452cff7c43",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "kubectl.md",
+                "mode": "source"
+              }
+            }
           }
-        }
+        ],
+        "direction": "horizontal"
       },
       {
-        "id": "63f809452cff7c43",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "kubectl.md",
-            "mode": "source"
+        "id": "e57d5c03b124762d",
+        "type": "split",
+        "children": [
+          {
+            "id": "73171b185cad148c",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source"
+              }
+            }
+          },
+          {
+            "id": "7f163f62fde9ebf7",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "agora server.md",
+                "mode": "source"
+              }
+            }
           }
-        }
+        ],
+        "direction": "horizontal"
       },
       {
-        "id": "7f163f62fde9ebf7",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "agora server.md",
-            "mode": "source"
+        "id": "fb083c1ec8c2f40d",
+        "type": "split",
+        "children": [
+          {
+            "id": "2c627e1fa0cf007d",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "2021-07-02.md",
+                "mode": "source"
+              }
+            }
+          },
+          {
+            "id": "1f94d8e6aef3ebfe",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "argh.md",
+                "mode": "source"
+              }
+            }
           }
-        }
-      },
-      {
-        "id": "2c627e1fa0cf007d",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "2021-07-02.md",
-            "mode": "source"
-          }
-        }
-      },
-      {
-        "id": "1f94d8e6aef3ebfe",
-        "type": "leaf",
-        "state": {
-          "type": "markdown",
-          "state": {
-            "file": "argh.md",
-            "mode": "source"
-          }
-        }
+        ],
+        "direction": "horizontal"
       },
       {
         "id": "d9ea409464f5016f",
@@ -141,7 +173,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "kubectl.md",
+                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -158,7 +190,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "kubectl.md"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           },
@@ -214,8 +246,10 @@
     "width": 300,
     "collapsed": true
   },
-  "active": "63f809452cff7c43",
+  "active": "73171b185cad148c",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "flancian.md",
     "kubectl.md",
     "2021-07-05.md",
     "2021-07-02.md",
@@ -223,8 +257,6 @@
     "chowdy.md",
     "agora server.md",
     "infranaut.md",
-    "zeno of elea.md",
-    "zeno.md",
-    "zeno's paradoxes.md"
+    "zeno of elea.md"
   ]
 }
\ No newline at end of file
diff --git a/2021-07-02.md b/2021-07-02.md
index 8bd81cf2a..efdf797e6 100644
--- a/2021-07-02.md
+++ b/2021-07-02.md
@@ -6,4 +6,6 @@
 - [[zeno]]
 - [[infranaut]]
 	- [[argh]]
-- [[agora server]]
\ No newline at end of file
+- [[agora server]]
+- [[ocell]] had to spend the night in the hospital :(
+	- she might have ingested toxic seeds (we didn't know they were toxic)
\ No newline at end of file
diff --git a/2021-07-03.md b/2021-07-03.md
new file mode 100644
index 000000000..2ac3e99f3
--- /dev/null
+++ b/2021-07-03.md
@@ -0,0 +1,27 @@
+- [[book]]
+- [[ocell]] spent the night in the hospital but we got a call saying she's fine and ready to be picked up! \o/
+	- [[lady burup]]
+- [[kanopi]]
+	- more discussion on pkm interop / standards, interesting
+- [[neil]]
+	- [[federated education]]
+- [[ed summers]]
+- [[wiki bus lines]]
+- [[loas a buda]]
+- [[obsidian]]
+	- https://twitter.com/flancian/status/1411292860788482049
+	- [[obsidian plugins]]
+		- [[sliding panes]] 
+			- https://twitter.com/ethanshamilton/status/1411348620121546755
+	- [[obsidian better tiling]]
+- [[my favourite things]]
+	- [[music]]
+	- [[john coltrane]]
+	- [[charlie parker]]
+- [[chiasm]]
+	- [[ontologies]]
+	- [[agora editor]]
+- [[aether]]
+- [[knovigator]]
+	
+[[Ocell]] is back and it makes me happy: https://twitter.com/flancian/status/1411357189097328648. She came back worse for wear (shaved in four spots, with the right eye a bit twitchy/as if irritated by something that happened during the night). But after spending several hours cleaning herself and relaxing she already looked happier. Then she decided to call it a night early and go to her favourite deep night spot at like 5pm, ha. I think she'll wake up refreshed and rejuvenated in the morning!
\ No newline at end of file
diff --git a/2021-07-04.md b/2021-07-04.md
new file mode 100644
index 000000000..778d6a614
--- /dev/null
+++ b/2021-07-04.md
@@ -0,0 +1,17 @@
+- [[would you agree]]
+- [[logseq]]
+	- [[tienson qin]]
+		- [[deta]]
+- [[agora social media integration]]
+	- [[agora social bridge]]
+- [[the future of note taking]]
+- [[wikipedia]]
+- [[do]]
+	- [[agora bot]]
+	- [x] pay bills
+	- [ ] call family
+	- pomodoro
+		- [ ] 0
+		- [ ] 1
+		- [ ] 2
+		- [ ] 3
\ No newline at end of file
diff --git a/In Flancia there are digital heterarchies.md b/In Flancia there are digital heterarchies.md
new file mode 100644
index 000000000..6aeded959
--- /dev/null
+++ b/In Flancia there are digital heterarchies.md	
@@ -0,0 +1 @@
+- [[pull]] [[liquid democracy]]
\ No newline at end of file
diff --git a/In Flancia there are few walled gardens.md b/In Flancia there are few walled gardens.md
new file mode 100644
index 000000000..1c401926e
--- /dev/null
+++ b/In Flancia there are few walled gardens.md	
@@ -0,0 +1 @@
+- [[pull]] [[in flancia there are no walled gardens]] [[walled garden]] [[walled gardens]]
\ No newline at end of file
diff --git a/In Flancia there are no hierarchies.md b/In Flancia there are no hierarchies.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/Pasted image 20210703185115.png b/Pasted image 20210703185115.png
new file mode 100644
index 000000000..cc444c0c6
Binary files /dev/null and b/Pasted image 20210703185115.png differ
diff --git a/Pasted image 20210703185116.png b/Pasted image 20210703185116.png
new file mode 100644
index 000000000..cc444c0c6
Binary files /dev/null and b/Pasted image 20210703185116.png differ
diff --git a/Pasted image 20210703185118 1.png b/Pasted image 20210703185118 1.png
new file mode 100644
index 000000000..cc444c0c6
Binary files /dev/null and b/Pasted image 20210703185118 1.png differ
diff --git a/Pasted image 20210703185118.png b/Pasted image 20210703185118.png
new file mode 100644
index 000000000..cc444c0c6
Binary files /dev/null and b/Pasted image 20210703185118.png differ
diff --git a/Pasted image 20210703185119.png b/Pasted image 20210703185119.png
new file mode 100644
index 000000000..cc444c0c6
Binary files /dev/null and b/Pasted image 20210703185119.png differ
diff --git a/Pasted image 20210703185422.png b/Pasted image 20210703185422.png
new file mode 100644
index 000000000..cc444c0c6
Binary files /dev/null and b/Pasted image 20210703185422.png differ
diff --git a/Untitled 5.md b/Untitled 5.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/aether.md b/aether.md
index e67a805bb..3876fde49 100644
--- a/aether.md
+++ b/aether.md
@@ -1,5 +1,8 @@
 - a [[tool]]
-- [[site]] https://aether.app/
-- [[go]] https://app.aether.app/
+	- [[site]] https://aether.app/
+	- [[go]] https://app.aether.app/
+	- [[universes]]
+		- [[aethereans]] https://app.aether.app/#/universe_c36dif5nbgrjjutf7kk0/subs/all
+		- [[flancia]] https://app.aether.app/#/universe_c3gbtolnbgrjjutf7me0/subs/all
 
 https://twitter.com/flancian/status/1406983365467770881
\ No newline at end of file
diff --git a/aethereans.md b/aethereans.md
new file mode 100644
index 000000000..b193583fd
--- /dev/null
+++ b/aethereans.md
@@ -0,0 +1,3 @@
+- an [[aether]] [[universe]]
+	- [[go]] https://app.aether.app/#/universe_c36dif5nbgrjjutf7kk0/subs/all
+	- [[welcome]] https://app.aether.app/#/universe_c36dif5nbgrjjutf7kk0/board/df0fcea07bbbf65f4e38595ee82b0511847ff2d35f6ebecb1712db7421c7deb8/chat
\ No newline at end of file
diff --git a/agora bot.md b/agora bot.md
index 27ec8996a..61ee6030a 100644
--- a/agora bot.md	
+++ b/agora bot.md	
@@ -1,10 +1,11 @@
-# Agora Bot
-
-- A [[bot]] 
-	- could be a [[project]] with [[s5bug]].
+- a [[bot]] 
 	- part of [[agora bridge]] component of the [[agora]].
-	- interacts with existing networks, starting with Mastodon.
-	- [[mastodon]] https://botsin.space/@agora
-	- [[twitter]] https://twitter.com/an_agora
+		- [[pull]] [[agora bridge]]
+	- interacts with existing networks, starting with Mastodon and Twitter.
+		- see [[agora social media integration]].
+		- [[mastodon]] https://botsin.space/@agora
+			- see `bots/mastodon` in [[go/agora-bridge]].
+		- [[twitter]] https://twitter.com/an_agora
+			- see `bots/twitter` in [[go/agora-bridge]].
 
 ![[Pasted image 20210625144520.png]]
\ No newline at end of file
diff --git a/agora bridge js.md b/agora bridge js.md
new file mode 100644
index 000000000..4f589d213
--- /dev/null
+++ b/agora bridge js.md	
@@ -0,0 +1,3 @@
+- [[go]] https://gitlab.com/fedstoa/agora-bridge-js
+	- unsure how to run this :)
+	- asked [[vera]]
\ No newline at end of file
diff --git a/agora editor.md b/agora editor.md
index 539684c00..fdc0e5252 100644
--- a/agora editor.md	
+++ b/agora editor.md	
@@ -1,13 +1,15 @@
 # Agora Editor
 
-- In a nutshell: you need to host your notes (more generally, [[resources]]), defaulting to [[markdown]] plus [[wikilinks]], somewhere else online. And then let the [[agora]] know about it.
-	- Most users currently host [[git]] repositories on https://github.com and https://gitlab.com. The Agora doesn't host your data, but rather pulls it from a location *you* control and renders it for you and other users; it interlinks your data with that of other users as you wish.
-	- Note this format also lets you easily publish your [[blog]] or [[digital garden]] independently online.
-- As of [[2021-05-07]], the recommended Agora editor is 
-	- [[foam]], if you want open source.
+- In a nutshell: you need to host your notes (more generally, [[resources]], defaulting to [[markdown]] plus [[wikilinks]]), somewhere online. And then let the [[agora]] know about it.
+	- The Agora doesn't host your data, but rather pulls it from a location *you* control and renders it for you and other users; in the process interlinking your data with that of other users.
+	- Most users currently host [[git]] repositories on https://github.com or https://gitlab.com. 
+	- Note using the default format (Markdown) lets you also easily publish your [[blog]] or [[digital garden]] independently online with tools such as [[jekyll]], [[gatsby]] or [[nikola]].
+- As of [[2021-05-07]], the recommended Agora editor is:
+	- [[foam]], if you want open source hosted locally.
 		- [[foam]] is a [[vscode]] [[extension]].
-		- [[foam]] is less straightforward to set up than the next option.
-	- [[obsidian]] if you don't mind using closed software from ethical companies, in particular a small one with a vibrant open source extension community. 
+		- [[foam]] is less straightforward to set up than the next options.
+	- [[logseq]], if you want open source, value the convenience of a hosted setup, *and* use [[chrome]] or a [[chromium based browser]] (any browser but [[firefox]], essentially).
+	- [[obsidian]] if you don't mind using closed software from a small ethical company, in particular a small one with a vibrant open source extension community. 
 		- You need at least also the [[obsidian git]] plugin.  See [[obsidian plugins]] for more.
 		- [[install obsidian]] by visiting https://obsidian.md and then follow [[vault backup]] to set up backup to [[git]]: https://docs.github.com/en/github/importing-your-projects-to-github/adding-an-existing-project-to-github-using-the-command-line.
 		- Then follow the procedure below to add your vault or [[digital garden]] to the [[agora]].
@@ -15,11 +17,10 @@
 	  - [[dendron]], which should be a drop-in [[foam]] replacement in [[vscode]].
 	  - [[roam]] plus [[roam2agora]]
 	  - [[org mode]]
-	  - [[jekyll]] and other static site generators
-	  - In essence, all you really need to use the [[Agora]] is the capability to produce text in some format and make it publicly available somewhere. 
+	  - In essence, all you really need to use the [[Agora]] is the capability to produce text in some format and make it publicly available somewhere. Plain text would suffice even.
 - After getting yourself a [[digital garden]], you need to let an [[agora]] know about it so it can be pulled and integrated. 
 	- Please send a [[pr]] adding your garden to [[gardens yaml]], accepting the agora's [[contract]] and indicating your desired username; or reach out to signup@anagora.org, [[flancian]] or [[vera]] with information about your use case. We'll do our best to make it work! We want the [[agora]] to be maximally inclusive.
 	- All [[agora]] users must agree to its [[contract]] as defined by the system account. 
 		- The contracts of other users can optionally be a [[endorsed]].
-- My proposal to you now is that we use the internet to think together of -given capability of sharing text and media with others at effectively zero cost and agree on a protocol to cooperate optimally in projects of [[public utility]].
-   - [[the agora is a markup convention]]
+- My proposal to you now is that we use the capability of sharing and discovering context-relevant media at effectively zero cost for the greater good: let's agree on a protocol to escape [[vendor lock-in]] and cooperate optimally on projects of [[public utility]].
+	- [[agora protocol]]
diff --git a/agora social media integration.md b/agora social media integration.md
index ee23b5120..ffa6c0820 100644
--- a/agora social media integration.md	
+++ b/agora social media integration.md	
@@ -1 +1,2 @@
-- [[go]] https://gitlab.com/fedstoa/agora-bridge-js
\ No newline at end of file
+- [[pull]] [[agora bridge js]]
+- [[pull]] [[agora bot]]
\ No newline at end of file
diff --git a/animal.md b/animal.md
index da6de0d0d..3166885c1 100644
--- a/animal.md
+++ b/animal.md
@@ -1,6 +1,6 @@
 # Animal
 
-- A kind of [[living]] [[entity]].
+- A kind of [[living]] [[pinstallhiinstalllosophyentity]].
 - [[go]] https://en.wikipedia.org/wiki/Animal
   - [[quote]] [[multicellular]] [[eukaryotic]] [[organisms]] from the biological kingdown [[animalia]].
 - [[people]] are animals.
diff --git a/argh.md b/argh.md
index a97984280..5b82dc4ab 100644
--- a/argh.md
+++ b/argh.md
@@ -4,4 +4,5 @@
 	- [[git]] https://github.com/i-infra/ARGH
 
 https://twitter.com/infra_naut/status/1411003663947120646
+
 https://twitter.com/flancian/status/1411017040916271109
\ No newline at end of file
diff --git a/book.md b/book.md
index 8a0278b72..671b1bfbc 100644
--- a/book.md
+++ b/book.md
@@ -1,27 +1,34 @@
 # Book
 
 - A [[thing]].
-  - A [[bag of holding]].
-  - [[equivalent]] to or [[convergent]] with all the knowledge, art and beauty potentially contained therein or transitively derived.
+	- [[pull]] [[books]].
+- A [[bag of holding]].
+	- [[conducive]] or [[convergent]] to the stuff and knowledge that in it you can carry or you can transitively derive.
 
-I'm trying to write a book. It's titled [[Flancia]]. I have lofty aspirations, as per usual, but it is really only a rough [[draft]].
+I'm trying to write a book. I call it [[Flancia]]. I have lofty aspirations, as usual, but it is really only a rough [[draft]].
 
-In lieu of the book, you'll have to accept this: this note you're reading, and the links you may choose to follow as you find them embedded in this sometimes awkward medium, which I'm putting together as a gift for [[you]].
+In lieu of the book, you'll have to accept this: this note you're reading, and the links you may choose to follow as you find them embedded in this sometimes awkward medium, which I'm trying to put together as a gift.
 
-These are the chapters of [[Flancia]]:
+[[Flancia]], or [[building bridges]]:
 
-- [[On building bridges]].
-- [[In Flancia there is an Agora]].
-- [[In Flancia there is no violence]].
-- [[In Flancia there are no rulers]].
-- [[In an Agora there are many Stoas]].
-- [[Towards Caramel City]].
-- [[Against gag orders]].
-- [[Open Ethics]].
-- [[Protopoi Space]].
-- [[On the pedagogy of the revolution]].
+- [[Meta]].
 - [[Manifesto]].
+- [[In Flancia we share clear goals]].
+- [[In Flancia there is an Agora]].
+- [[In Flancia there is no poverty]].
+- [[In Flancia there is no privilege]].
+- [[In Flancia there is no violence]].
+- [[In Flancia we will one day meet]].
+- [[In Flancia there are few walled gardens]].
+- [[In Flancia there are many cooperatives]].
+- [[In Flancia government is a digital heterarchy]].
+- [[Caramel City]].
+- [[Against gag orders]].
+- [[Against copyright]].
+- [[Protopoi]].
+- [[Open ethics]].
+- [[On the pedagogy of the revolution]].
 
 Please consider this an offering to the [[people]].
 
-Have a nice day! And I hope you [[thrive]].
\ No newline at end of file
+Have a nice day! I hope you [[thrive]].
\ No newline at end of file
diff --git a/chiasm.md b/chiasm.md
new file mode 100644
index 000000000..cf0f6a293
--- /dev/null
+++ b/chiasm.md
@@ -0,0 +1,3 @@
+- a [[person]].
+	- [[scientist]] [[academic]] [[science fiction]]
+	- [[mastodon]] https://mastodon.online/@chiasm
\ No newline at end of file
diff --git a/cloud computer.md b/cloud computer.md
new file mode 100644
index 000000000..c86904900
--- /dev/null
+++ b/cloud computer.md	
@@ -0,0 +1,2 @@
+- a [[distributed]] computer with no differentiated [[server]] components.
+	- [[pull]] [[cloud computers]]
\ No newline at end of file
diff --git a/cloud computers.md b/cloud computers.md
new file mode 100644
index 000000000..c4339c26e
--- /dev/null
+++ b/cloud computers.md	
@@ -0,0 +1,6 @@
+- a [[list]].
+	- [[pull]] [[cloud computer]]
+	- [[pull]] [[fission]]
+	- [[pull]] [[deta]]
+	- [[pull]] [[urbit]]
+		- disclaimer: a [[friend]] told me to stay away from urbit.
\ No newline at end of file
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
new file mode 100644
index 000000000..53d94bb26
--- /dev/null
+++ b/conflict-files-obsidian-git.md
@@ -0,0 +1,4 @@
+# Conflict files
+Please resolve them and commit per command (This file will be deleted before the commit).
+- Not a file: .obsidian-git-data
+- Not a file: .obsidian/workspace
\ No newline at end of file
diff --git a/deta.md b/deta.md
new file mode 100644
index 000000000..9d3df2897
--- /dev/null
+++ b/deta.md
@@ -0,0 +1,4 @@
+- a [[cloud computer]]
+	- [[go]] https://deta.space
+	- [[dweb]] [[web native]]
+	
\ No newline at end of file
diff --git a/ed summers.md b/ed summers.md
new file mode 100644
index 000000000..cfab52fc3
--- /dev/null
+++ b/ed summers.md	
@@ -0,0 +1,8 @@
+- a [[person]]
+	- in [[social coop]]
+	- [[pull]] [[edsu]]
+	- [[go]] https://inkdroid.org
+	- [[mastodon]] https://social.coop/@edsu
+	- [[git]] https://github.com/edsu
+	- [[matrix]] @edsu:matrix.org
+	- [[music]] https://bandcamp.com/edsu
\ No newline at end of file
diff --git a/edsu.md b/edsu.md
new file mode 100644
index 000000000..bcd7ccee5
--- /dev/null
+++ b/edsu.md
@@ -0,0 +1 @@
+- [[pull]] [[ed summers]]
\ No newline at end of file
diff --git a/entity.md b/entity.md
index 60caf3ec5..db35b79d9 100644
--- a/entity.md
+++ b/entity.md
@@ -1,6 +1,6 @@
 # Entity
 
-- A [[thing]] or a [[being]] with distinct and independent [[existence]].
+- A [[thing]] or a [[beipinstallhiinstalllosophyng]] with distinct and independent [[existence]].
 - In the [[agora]], entities map to [[all possible wikilinks]].
   - In the [[agora]], there are no 404s.
   - All [[agora url space]] is owned by its users. Entities are top level items, like so: <anagora.org/entity>. And because subnodes in the agora are [[crowdsourced]] and are served by the [[agora]] at reasonable (related) URLs, users control this space.
diff --git a/favourites.md b/favourites.md
new file mode 100644
index 000000000..1a101b062
--- /dev/null
+++ b/favourites.md
@@ -0,0 +1 @@
+- [[my favourite things]]
\ No newline at end of file
diff --git a/federated education.md b/federated education.md
new file mode 100644
index 000000000..3628019c8
--- /dev/null
+++ b/federated education.md	
@@ -0,0 +1,7 @@
+- an [[article]]
+	- by [[mike caulfield]]
+	- [[go]] https://hapgood.us/2014/11/06/federated-education-new-directions-in-digital-collaboration/
+	
+https://social.coop/web/statuses/106516468594327543
+
+https://social.coop/web/statuses/106516530348326882
\ No newline at end of file
diff --git a/information science.md b/information science.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/john coltrane.md b/john coltrane.md
new file mode 100644
index 000000000..e9676e35d
--- /dev/null
+++ b/john coltrane.md	
@@ -0,0 +1,4 @@
+- a [[person]]
+	- [[jazz]] [[musician]] [[saxophonist]]
+	- [[a love supreme]]
+	- [[my favourite things]]
\ No newline at end of file
diff --git a/junyu zhan.md b/junyu zhan.md
new file mode 100644
index 000000000..ad4400246
--- /dev/null
+++ b/junyu zhan.md	
@@ -0,0 +1,3 @@
+- a [[person]].
+	- works on [[logseq]].
+	- met them in [[i annotate 2021]].
\ No newline at end of file
diff --git a/knovigator.md b/knovigator.md
new file mode 100644
index 000000000..e5498329c
--- /dev/null
+++ b/knovigator.md
@@ -0,0 +1,7 @@
+- an [[app]].
+	- [[social zettelkasten]]
+	- [[twitter]] https://twitter.com/knovigator
+	- [[go]] https://www.knovigator.com
+		- "[[write]] with re-usable knowledge building blocks for effortless [[creativity]] and [[collaboration]]"
+	- [[reddy2go]] https://twitter.com/reddy2go/status/1411415832484225028
+	- [[demo]] https://twitter.com/knovigator/status/1411417318438096896
\ No newline at end of file
diff --git a/living.md b/living.md
new file mode 100644
index 000000000..4917574a9
--- /dev/null
+++ b/living.md
@@ -0,0 +1 @@
+- [[pull]] [[life]] [[alive]]
\ No newline at end of file
diff --git a/loas a buda.md b/loas a buda.md
new file mode 100644
index 000000000..c0b9bccf7
--- /dev/null
+++ b/loas a buda.md	
@@ -0,0 +1,2 @@
+"Loas a Buda.
+Loas a todas las maravillas del universo."
\ No newline at end of file
diff --git a/logseq.md b/logseq.md
index 8b25c073e..07d3d3961 100644
--- a/logseq.md
+++ b/logseq.md
@@ -1,8 +1,10 @@
 # Logseq
 
 - a [[tool]] 
-	- [[pkm]], [[roam like]] (but didn't set out to be a clone)
-	- by [[tienson qin]]
+	- [[note taking]]
+		- [[pkm]]
+		- [[roam like]], but didn't set out to be a clone
+	- by [[tienson qin]], [[junyu zhan]]
 	- [[twitter]]: https://twitter.com/logseq
 	- [[go]] https://logseq.com.
 	- could be a better default [[agora editor]] than [[foam]]
diff --git a/manifesto.md b/manifesto.md
index 08ec0b7ed..6f7ada842 100644
--- a/manifesto.md
+++ b/manifesto.md
@@ -1,10 +1,6 @@
-# Manifesto
-
-- I am [[Flancian]] and this is my manifesto:
-  - In Flancia there is no [[poverty]].
-  - In Flancia there is no [[privilege]].
-  - In Flancia we could agree to [[meet]].
-  - In [[Flancia]] there is an [[Agora]].
-- [[go]] flancia.org/manifesto
-
-
+- [[go]] flancia.org/manifesto 
+	- I am a [[Flancian]] and this is my manifesto:
+		- In Flancia there is no [[poverty]].
+		- In Flancia there is no [[privilege]]. 
+		- In Flancia we will one day [[meet]].
+		- In [[Flancia]] there is an [[Agora]].
\ No newline at end of file
diff --git a/meta.md b/meta.md
index 4fa5a319f..34433a410 100644
--- a/meta.md
+++ b/meta.md
@@ -1,2 +1 @@
-# Meta
-
+- [[go]] https://flancia.org/meta
diff --git a/mike caulfield.md b/mike caulfield.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/my favourite things.md b/my favourite things.md
index 3fd3ed1e8..5b6b5487e 100644
--- a/my favourite things.md	
+++ b/my favourite things.md	
@@ -1,5 +1,8 @@
 # My Favourite Things
 
-- A great [[jazz]] [[standard]].
-- Love the [[john coltrane]] version.
+- A [[jazz]] [[standard]].
+	- Great.
+	- Love the [[john coltrane]] version.
+	- Also [[charlie parker]]'s.
+- a [[list]].
 
diff --git a/neil.md b/neil.md
index babb0f0ef..af1cc654e 100644
--- a/neil.md
+++ b/neil.md
@@ -1,12 +1,12 @@
 # Neil
 
  - A [[person]].
-   - [[friend]]
-   - [[doubleloop]]
-   - I like his writing and really appreciate his presence in this [[agora]].
-   - [[mastodon]] @neil@social.coop
-   - [[social coop]]
-   - Uses [[org-roam]]. 
-   - [[matrix]] @doubleloop:matrix.org
+	- [[friend]]
+	- [[doubleloop]]
+	- I like his writing and really appreciate his presence in this [[agora]].
+	- [[mastodon]] @neil@social.coop
+	- [[social coop]]
+	- Uses [[org-roam]]. 
+	- [[matrix]] @doubleloop:matrix.org
 
 
diff --git a/obsidian better tiling.md b/obsidian better tiling.md
new file mode 100644
index 000000000..167d4ea01
--- /dev/null
+++ b/obsidian better tiling.md	
@@ -0,0 +1,5 @@
+- a [[feature request]]
+	- possibly an [[extension]]?
+	- [[go]] https://forum.obsidian.md/t/better-tiling-pane-arrangement/20383
+		- https://twitter.com/flancian/status/1411292860788482049
+		- https://twitter.com/flancian/status/1401182347316412416
\ No newline at end of file
diff --git a/obsidian.md b/obsidian.md
index 4c36ee25f..3fee5087e 100644
--- a/obsidian.md
+++ b/obsidian.md
@@ -1,18 +1,20 @@
 # Obsidian
 
-- an [[agora editor]]
-  - [[pkm]] = [[roam like]]
-  - [[go]] https://obsidian.md
-  - as of [[2021-05-07]] the recommended [[agora editor]].
-	  - previously I had tried it after [[roam]] -- but I left it behind for [[foam]] on due to it not being [[open source]].
-	  - [[foam]] seemed more easily extensible to me.
-  	  - this thread was what sealed the deal, didn't make it sound like open source was likely to happen anytime soon: https://forum.obsidian.md/t/open-sourcing-of-obsidian/1515.  I then wrote https://flancia.org/go/why-not-obsidian.
-	  - as of [[2021-05-07]] I'm back to [[obsidian]] from [[foam]]. I no longer think it's a deal breaker as pro-social companies might need to refrain but being fully open at all times to remain competitive in the market, and Obsidian's business model (where they charge for optional features like sync and do not block community solutions in the same space) seems fair to me.
-	    - see [[defoam]] for a description of the migration process.
-		- [[obsidian]] is [[faster]], [[polished]] and has a great [[community extensions]] market.
-		- [[obsidian git]] is a great [[vault]] backup solution and open source. It replaces proprietary [[cloud sync]] -- which you need to pay for if you get it from [[obsidian]] directly.
-	 
+- a [[tool]]
+	- for note taking/[[pkm]]; an [[agora editor]]
+	- [[go]] https://obsidian.md
+	- [[forum]] https://forum.obsidian.md/
+	- as of [[2021-05-07]] the recommended closed source [[agora editor]].
+		- previously I had tried it after [[roam]] -- but I left it behind for [[foam]] on due to it not being [[open source]].
+			- this thread was what sealed the deal, didn't make it sound like open source was likely to happen anytime soon: https://forum.obsidian.md/t/open-sourcing-of-obsidian/1515.  I then wrote https://flancia.org/go/why-not-obsidian.
+		- [[foam]] seemed more easily extensible to me, but [[obsidian plugins]] (community maintained) tend to be great and open source.
+			- [[obsidian git]] is a great [[vault]] backup solution and open source. It replaces proprietary [[cloud sync]] -- which you need to pay for if you get it from [[obsidian]] directly.
+		- as of [[2021-05-07]] I'm back to [[obsidian]] from [[foam]]. I no longer think it's a deal breaker as pro-social companies might need to refrain but being fully open at all times to remain competitive in the market, and Obsidian's business model (where they charge for optional features like sync and do not block community solutions in the same space) seems fair to me.
+		- see [[defoam]] for a description of the migration process.
+		- [[obsidian]] is [[faster]], a bit more [[polished]] and has a great [[community extensions]] market.
+
 https://twitter.com/flancian/status/1390757242786533384
+
 https://twitter.com/flancian/status/1310487321767219200
 
 
diff --git a/ontologies.md b/ontologies.md
index ba3c5a5fe..3a7fa140b 100644
--- a/ontologies.md
+++ b/ontologies.md
@@ -1,4 +1,4 @@
 # Ontologies
 
-- [[pull]] [[ontology]]
+- [[pull]] [[ontinstallology]]
 
diff --git a/ontology.md b/ontology.md
index 2a01622d3..2d8e48d38 100644
--- a/ontology.md
+++ b/ontology.md
@@ -1,4 +1,4 @@
-- a branch of [[philosophy]].
+- a branch of [[pinstallhiinstalllosophypinstallhiinstalllosophy]].
 	- [[pull]] https://en.wikipedia.org/wiki/Ontology
 - a branch of [[information science]].
 	- [[pull]] https://en.wikipedia.org/wiki/Ontology_(information_science)
diff --git a/pers![[Pasted imag![[Pasted image 20210703185116.png.md b/pers![[Pasted imag![[Pasted image 20210703185116.png.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/pers![[Pasted image 20210703185115.png.md b/pers![[Pasted image 20210703185115.png.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/phiinstalllosophy.md b/phiinstalllosophy.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/philosophy.md b/philosophy.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/pinstallhiinstalllosophy.md b/pinstallhiinstalllosophy.md
new file mode 100644
index 000000000..e69de29bb
diff --git a/poll.md b/poll.md
index 0eb84c199..e45429d2b 100644
--- a/poll.md
+++ b/poll.md
@@ -1,5 +1,4 @@
-
-- an [[action]]
-	- takes a node and queries its sources for updates
-- [[social media]] contains many [[underlays]]
-	- [[pull]] [[agora polls]]
\ No newline at end of file
+- an [[action]].
+	- attaches an [[agora poll]] to a [[node]]
+	- [[pull]] [[agora polls]]
+		- [[social media]] is an [[interlay]] that the [[agora]] will try to integrate with.
\ No newline at end of file
diff --git a/tienson qin.md b/tienson qin.md
index 4dfb88f71..870e8fe44 100644
--- a/tienson qin.md	
+++ b/tienson qin.md	
@@ -1,4 +1,35 @@
 - a [[person]]
 	- [[coder]]
 		- [[logseq]]
-	- [[twitter]] https://twitter.com/tiensonqin
\ No newline at end of file
+	- [[twitter]] https://twitter.com/tiensonqin
+	- [[roadmap]] https://trello.com/b/8txSM12G/logseq-roadmap 
+
+## [[2021-07-04]]
+- huge fan!
+- what does [[logseq]] need/how are you doing?
+	- five people
+		- [[tienson qin]] is in [[hangzhou]]
+		- met [[junyu zhan]] as well
+	- funding from friends
+	- [[note taking]] app, but in the future would like to develop a [[platform]] to exchange knowledge
+	- vision: [[open knowledge]] and [[free knowledge]] for everyone
+- why [[logseq]] was written
+	- worked for [[streamlabs]]
+	- been doing [[clojure]] for 10y (!)
+		- started with php many years ago :)
+		- completely rewrote in clojure
+	- was personally using [[org mode]] and [[tiddlywiki]]
+		- q: how difficult it is to support logseq with both org mode and markdown?
+		- not very hard as they both get converted to [[datascript]]
+- q: do you plan to go beyond [[outliner]] mode?
+	- fan of [[whimsical]], but commercial/not open source
+	- want to have different modes, not only outliner
+- q: are you interested in cross-platform login/signup
+	- [[fission]] and [[deta]]
+- q: how should platforms integrate with logseq?
+	- ...
+- [[agora]] vision
+	- social media integration
+		
+## Example of free form section
+This would be an example of a non-outliner section.
\ No newline at end of file
diff --git a/vendor lock-in.md b/vendor lock-in.md
new file mode 100644
index 000000000..ce8d1d6be
--- /dev/null
+++ b/vendor lock-in.md	
@@ -0,0 +1,2 @@
+- a force that opposes the [[free internet]].
+- often goes hand in hand with [[walled gardens]].
\ No newline at end of file
diff --git a/web native.md b/web native.md
new file mode 100644
index 000000000..d78819f4d
--- /dev/null
+++ b/web native.md	
@@ -0,0 +1 @@
+- a tool or app that runs in a [[cloud computer]], needing no specific server components.
\ No newline at end of file
diff --git a/wikipedia.md b/wikipedia.md
index 9e0b6205a..d3d52c189 100644
--- a/wikipedia.md
+++ b/wikipedia.md
@@ -1,6 +1,11 @@
-# Wikipedia
-
-- Well, you know. Just one of humanity's best projects.
-- [[go]] wikipedia.org
+- a [[project]].
+	- one of [[humanity's best]].
+	- by [[wikimedia foundation]].
+	- [[pull]] https://wikipedia.org
+		- in the [[agora]], you can usually [[pull]] (transclude) Wikipedia.
+		- [[go]] [[pull]]
+	- [[poll]]
+		- https://twitter.com/flancian/status/1411682076148047872
+		- https://botsin.space/web/statuses/106522627026135700
 
 
diff --git a/would you agree.md b/would you agree.md
new file mode 100644
index 000000000..19efd7abe
--- /dev/null
+++ b/would you agree.md	
@@ -0,0 +1,2 @@
+- https://twitter.com/flancian/status/1411684826579705856
+- https://botsin.space/web/statuses/106522664542214570
\ No newline at end of file