rename articles to research

152 files changed, 251 insertions, 21 deletions

diff --git a/root/$order b/root/$order
index 15ac679..23c4745 100644
--- a/root/$order
+++ b/root/$order
@@ -1,6 +1,6 @@
 about
 blog
-articles
+research
 workshops
 games
 projects
diff --git a/root/articles/$order b/root/articles/$order
deleted file mode 100644
index 97f81e8..0000000
--- a/root/articles/$order
+++ /dev/null
@@ -1,2 +0,0 @@
-mmmfs
-realities
diff --git a/root/articles/mmmfs/examples/pinwall/image/pinwall_info: text$json b/root/articles/mmmfs/examples/pinwall/image/pinwall_info: text$json
deleted file mode 100644
index e5893ac..0000000
--- a/root/articles/mmmfs/examples/pinwall/image/pinwall_info: text$json
+++ /dev/null
@@ -1 +0,0 @@
-{"x": 94.0, "y": 265.0, "w": 205.0, "h": 155.0}
\ No newline at end of file
diff --git a/root/articles/mmmfs/examples/pinwall/text/pinwall_info: text$json b/root/articles/mmmfs/examples/pinwall/text/pinwall_info: text$json
deleted file mode 100644
index 39bdb45..0000000
--- a/root/articles/mmmfs/examples/pinwall/text/pinwall_info: text$json
+++ /dev/null
@@ -1 +0,0 @@
-{"x": 53.0, "y": 64.0, "w": 396.0, "h": 74.0}
\ No newline at end of file
diff --git a/root/articles/mmmfs/examples/pinwall/video/pinwall_info: text$json b/root/articles/mmmfs/examples/pinwall/video/pinwall_info: text$json
deleted file mode 100644
index 7be8702..0000000
--- a/root/articles/mmmfs/examples/pinwall/video/pinwall_info: text$json
+++ /dev/null
@@ -1 +0,0 @@
-{"x": 534.0, "y": 136.0, "w": 387.0, "h": 218.0}
\ No newline at end of file
diff --git a/root/articles/title: text$plain b/root/articles/title: text$plain
deleted file mode 100644
index c45a444..0000000
--- a/root/articles/title: text$plain
+++ /dev/null
@@ -1 +0,0 @@
-articles and papers
diff --git a/root/portfolio/text$moonscript -> mmm$dom.moon b/root/portfolio/text$moonscript -> mmm$dom.moon
index 5a1de7f..0672298 100644
--- a/root/portfolio/text$moonscript -> mmm$dom.moon
+++ b/root/portfolio/text$moonscript -> mmm$dom.moon
@@ -213,7 +213,7 @@ projects = {
         li text 'client/server polymorphic UI framework'
         li text 'built-in server-side rendering and interactive editing support'
       }
-      href: '/articles/mmmfs/'
+      href: '/research/mmmfs/'
       media: embed_img '/portfolio/mmm/media:image/png'
       tags: :tool, :lua
     }
diff --git a/root/research/$order b/root/research/$order
new file mode 100644
index 0000000..e05ba2c
--- /dev/null
+++ b/root/research/$order
@@ -0,0 +1,4 @@
+realities
+mmmfs
+watch-cad
+alivecoding
diff --git a/root/research/alivecoding/description: text$plain b/root/research/alivecoding/description: text$plain
new file mode 100644
index 0000000..1b1a6fc
--- /dev/null
+++ b/root/research/alivecoding/description: text$plain
@@ -0,0 +1 @@
+livecoding with persistent expressions
diff --git a/root/research/alivecoding/link: URL -> youtube$video b/root/research/alivecoding/link: URL -> youtube$video
new file mode 100644
index 0000000..09e55ee
--- /dev/null
+++ b/root/research/alivecoding/link: URL -> youtube$video
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=ZXqgFb1U7q0
diff --git a/root/articles/mmmfs/$order b/root/research/mmmfs/$order
index d58d878..45f4eb8 100644
--- a/root/articles/mmmfs/$order
+++ b/root/research/mmmfs/$order
@@ -12,3 +12,4 @@ conclusion
 references
 ba_log
 statement-of-originality
+defense
diff --git a/root/research/mmmfs/_web_view: type b/root/research/mmmfs/_web_view: type
new file mode 100644
index 0000000..bde5644
--- /dev/null
+++ b/root/research/mmmfs/_web_view: type
@@ -0,0 +1 @@
+text/html+interactive
diff --git a/root/articles/mmmfs/abstract/text$markdown+sidenotes.md b/root/research/mmmfs/abstract/text$markdown+sidenotes.md
index c7d6c9c..c7d6c9c 100644
--- a/root/articles/mmmfs/abstract/text$markdown+sidenotes.md
+++ b/root/research/mmmfs/abstract/text$markdown+sidenotes.md
diff --git a/root/articles/mmmfs/ba_log/$order b/root/research/mmmfs/ba_log/$order
index a77277a..a77277a 100644
--- a/root/articles/mmmfs/ba_log/$order
+++ b/root/research/mmmfs/ba_log/$order
diff --git a/root/articles/mmmfs/ba_log/2019-10-07/text$markdown.md b/root/research/mmmfs/ba_log/2019-10-07/text$markdown.md
index 46c6892..46c6892 100644
--- a/root/articles/mmmfs/ba_log/2019-10-07/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-10-07/text$markdown.md
diff --git a/root/articles/mmmfs/ba_log/2019-10-08/text$markdown.md b/root/research/mmmfs/ba_log/2019-10-08/text$markdown.md
index c10b75f..c10b75f 100644
--- a/root/articles/mmmfs/ba_log/2019-10-08/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-10-08/text$markdown.md
diff --git a/root/articles/mmmfs/ba_log/2019-10-09/text$markdown.md b/root/research/mmmfs/ba_log/2019-10-09/text$markdown.md
index 702620d..702620d 100644
--- a/root/articles/mmmfs/ba_log/2019-10-09/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-10-09/text$markdown.md
diff --git a/root/articles/mmmfs/ba_log/2019-10-10/text$markdown.md b/root/research/mmmfs/ba_log/2019-10-10/text$markdown.md
index 010f861..c207b83 100644
--- a/root/articles/mmmfs/ba_log/2019-10-10/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-10-10/text$markdown.md
@@ -16,7 +16,7 @@ all content below the current fileder, rather than just including the child-file
 Here are some example links for viewing these:
 
 - [`/?index: text/html`](/?index:%20text/html)
-- [`/articles/mmmfs/ba_log/?index: text/html`](/articles/mmmfs/ba_log/?index:%20text/html)
+- [`/research/mmmfs/ba_log/?index: text/html`](/research/mmmfs/ba_log/?index:%20text/html)
 
 Finally I added a third pseudo-facet called `?interactive` that renders the Inspector that the old page ran on,
 allowing to inspect raw facets, and bringing back the navbar \[[`9ab2f0f`][9ab2f0f]\].
@@ -38,7 +38,7 @@ With this need for optimization taken care of, I added a new datastore (`web`) \
 Instead of directly accessing a database or physical file system, like the `sql` and `fs` stores, the `web` store delegates all
 requests to the server APIs I have been building, such as the new `?index` pseudo-facet.
 
-[2019-10-08]: /articles/mmmfs/ba_log/2019-10-08/
+[2019-10-08]: /research/mmmfs/ba_log/2019-10-08/
 [005cc9b]: https://git.s-ol.nu/mmm/commit/005cc9b3914128267017620984aee921999e173f/
 [b36a1a6]: https://git.s-ol.nu/mmm/commit/b36a1a6c61a6e8bff156ce4e2dc66fe8ed8cd95e/
 [9ab2f0f]: https://git.s-ol.nu/mmm/commit/9ab2f0fe3a1a043300536a057bafe5058d987d7f/
diff --git a/root/articles/mmmfs/ba_log/2019-10-11/text$markdown.md b/root/research/mmmfs/ba_log/2019-10-11/text$markdown.md
index 0b58c75..0b58c75 100644
--- a/root/articles/mmmfs/ba_log/2019-10-11/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-10-11/text$markdown.md
diff --git a/root/articles/mmmfs/ba_log/2019-10-14/text$markdown.md b/root/research/mmmfs/ba_log/2019-10-14/text$markdown.md
index e42f8be..e42f8be 100644
--- a/root/articles/mmmfs/ba_log/2019-10-14/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-10-14/text$markdown.md
diff --git a/root/articles/mmmfs/ba_log/2019-10-15/text$markdown.md b/root/research/mmmfs/ba_log/2019-10-15/text$markdown.md
index d4e4121..7e5ee02 100644
--- a/root/articles/mmmfs/ba_log/2019-10-15/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-10-15/text$markdown.md
@@ -2,7 +2,7 @@ I'm giving a workshop next weekend, and I had to create the slides for that.
 Since one of the aspirations of `mmmfs` is to be easily adaptable to any kind of data organization and -presentation task,
 that was a good opportunity to try and implement a simple slideshow system.
 
-I started by creating a new fileder to hold the slideshow, [`/articles/xy-workshop`](/articles/xy-workshop/).
+I started by creating a new fileder to hold the slideshow, [`/workshops/xy-music`](/workshops/xy-music/).
 In the main facet, I created a MoonScript file.
 Since the facet needs to access its children (the individual slides), I also used the `fn ->` type,
 that injects the current fileder into the script.
diff --git a/root/articles/mmmfs/ba_log/2019-10-24/text$markdown.md b/root/research/mmmfs/ba_log/2019-10-24/text$markdown.md
index dbb838a..8a2fe2b 100644
--- a/root/articles/mmmfs/ba_log/2019-10-24/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-10-24/text$markdown.md
@@ -26,7 +26,7 @@ Once mermaid.js is done, the rendered content is added in the container element.
 Here is one of the two diagrams that I implemented the feature for,
 you can also follow the link through to the source and view the textual representation using the 'inspect' button.
 
-<mmm-embed path="/articles/mmmfs/mmmfs/tree_mainstream"></mmm-embed>
+<mmm-embed path="/research/mmmfs/mmmfs/tree_mainstream"></mmm-embed>
 
 [mermaid]: https://mermaidjs.github.io/mermaid-live-editor/
 [2ff6f90]: https://git.s-ol.nu/mmm/commit/2ff6f906c498c1b742dd8437a09c97ebe29a652a/
diff --git a/root/articles/mmmfs/ba_log/2019-10-26/text$markdown.md b/root/research/mmmfs/ba_log/2019-10-26/text$markdown.md
index d5cd9bd..ff97871 100644
--- a/root/articles/mmmfs/ba_log/2019-10-26/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-10-26/text$markdown.md
@@ -58,5 +58,5 @@ when a fileder that is mentioned in `$order` is deleted via the `stores.fs` API,
 it is not removed from `$order`, causing an error the next time the fileder is listed.
 I will probably get around to fixing both of these problems when I build the corresponding UI.
 
-[2019-10-24]: /articles/mmmfs/ba_log/2019-10-24/
+[2019-10-24]: /research/mmmfs/ba_log/2019-10-24/
 [a62f63b]: https://git.s-ol.nu/mmm/commit/a62f63bc00cd63a98b349a2574e3e9e14c95a441/
diff --git a/root/articles/mmmfs/ba_log/2019-10-27/$order b/root/research/mmmfs/ba_log/2019-10-27/$order
index 2b68b52..2b68b52 100644
--- a/root/articles/mmmfs/ba_log/2019-10-27/$order
+++ b/root/research/mmmfs/ba_log/2019-10-27/$order
diff --git a/root/articles/mmmfs/ba_log/2019-10-27/text$markdown.md b/root/research/mmmfs/ba_log/2019-10-27/text$markdown.md
index 3e9f886..3e9f886 100644
--- a/root/articles/mmmfs/ba_log/2019-10-27/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-10-27/text$markdown.md
diff --git a/root/articles/mmmfs/ba_log/2019-10-27/video/video$webm.webm b/root/research/mmmfs/ba_log/2019-10-27/video/video$webm.webm
index 020e352..020e352 100644
--- a/root/articles/mmmfs/ba_log/2019-10-27/video/video$webm.webm
+++ b/root/research/mmmfs/ba_log/2019-10-27/video/video$webm.webm
diff --git a/root/articles/mmmfs/ba_log/2019-10-29/$order b/root/research/mmmfs/ba_log/2019-10-29/$order
index 2b68b52..2b68b52 100644
--- a/root/articles/mmmfs/ba_log/2019-10-29/$order
+++ b/root/research/mmmfs/ba_log/2019-10-29/$order
diff --git a/root/articles/mmmfs/ba_log/2019-10-29/text$markdown.md b/root/research/mmmfs/ba_log/2019-10-29/text$markdown.md
index 4119d21..4119d21 100644
--- a/root/articles/mmmfs/ba_log/2019-10-29/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-10-29/text$markdown.md
diff --git a/root/articles/mmmfs/ba_log/2019-10-29/video/video$mp4.mp4 b/root/research/mmmfs/ba_log/2019-10-29/video/video$mp4.mp4
index 162d0fc..162d0fc 100644
--- a/root/articles/mmmfs/ba_log/2019-10-29/video/video$mp4.mp4
+++ b/root/research/mmmfs/ba_log/2019-10-29/video/video$mp4.mp4
diff --git a/root/articles/mmmfs/ba_log/2019-11-01/$order b/root/research/mmmfs/ba_log/2019-11-01/$order
index 1549b67..1549b67 100644
--- a/root/articles/mmmfs/ba_log/2019-11-01/$order
+++ b/root/research/mmmfs/ba_log/2019-11-01/$order
diff --git a/root/articles/mmmfs/ba_log/2019-11-01/demo/video$webm.webm b/root/research/mmmfs/ba_log/2019-11-01/demo/video$webm.webm
index 1463897..1463897 100644
--- a/root/articles/mmmfs/ba_log/2019-11-01/demo/video$webm.webm
+++ b/root/research/mmmfs/ba_log/2019-11-01/demo/video$webm.webm
diff --git a/root/articles/mmmfs/ba_log/2019-11-01/text$markdown.md b/root/research/mmmfs/ba_log/2019-11-01/text$markdown.md
index afcaf0a..c9c4214 100644
--- a/root/articles/mmmfs/ba_log/2019-11-01/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-11-01/text$markdown.md
@@ -11,7 +11,7 @@ Here is a short demo video of these features:
 
 As usual, this can be tried out immediately at [`sandbox.s-ol.nu`](//sandbox.s-ol.nu)
 
-[2019-10-26]: /articles/mmmfs/ba_log/2019-10-26/
+[2019-10-26]: /research/mmmfs/ba_log/2019-10-26/
 [dc08e26]: https://git.s-ol.nu/mmm/commit/dc08e262cd53a48480a88235aa58500f0638ad79/
 [ff9ee8e]: https://git.s-ol.nu/mmm/commit/ff9ee8e99cd5f5c420ba0501c335ac18f1b10769/
 [053e607]: https://git.s-ol.nu/mmm/commit/053e607a49989b2d4491c20ff14c839b7161d713/
diff --git a/root/articles/mmmfs/ba_log/2019-11-25/$order b/root/research/mmmfs/ba_log/2019-11-25/$order
index 1549b67..1549b67 100644
--- a/root/articles/mmmfs/ba_log/2019-11-25/$order
+++ b/root/research/mmmfs/ba_log/2019-11-25/$order
diff --git a/root/articles/mmmfs/ba_log/2019-11-25/demo/video$webm.webm b/root/research/mmmfs/ba_log/2019-11-25/demo/video$webm.webm
index bdf9d9c..bdf9d9c 100644
--- a/root/articles/mmmfs/ba_log/2019-11-25/demo/video$webm.webm
+++ b/root/research/mmmfs/ba_log/2019-11-25/demo/video$webm.webm
diff --git a/root/articles/mmmfs/ba_log/2019-11-25/text$markdown.md b/root/research/mmmfs/ba_log/2019-11-25/text$markdown.md
index 48a0bb4..e458b51 100644
--- a/root/articles/mmmfs/ba_log/2019-11-25/text$markdown.md
+++ b/root/research/mmmfs/ba_log/2019-11-25/text$markdown.md
@@ -83,7 +83,7 @@ update_info = (fileder, x, y, w, h) ->
 [The rest of the code][source] is just about catching the events when the mouse is clicked/release/moved and when a child is resized,
 and then calling `update_info` as appropriate.
 
-[info]: /articles/mmmfs/examples/pinwall/image/pinwall_info:%20text/html+interactive
-[pinwall]: /articles/mmmfs/examples/pinwall/
-[source]: https://git.s-ol.nu/mmm/blob/5ec1fe2fc943ad4123fac138de70d4152e8b341d/root/articles/mmmfs/examples/pinwall/text%24moonscript%20-%3E%20fn%20-%3E%20mmm%24dom.moon
+[info]: /research/mmmfs/examples/pinwall/image/pinwall_info:%20text/html+interactive
+[pinwall]: /research/mmmfs/examples/pinwall/
+[source]: https://git.s-ol.nu/mmm/blob/5ec1fe2fc943ad4123fac138de70d4152e8b341d/root/research/mmmfs/examples/pinwall/text%24moonscript%20-%3E%20fn%20-%3E%20mmm%24dom.moon
 [5ec1fe2]: https://git.s-ol.nu/mmm/blob/5ec1fe2fc943ad4123fac138de70d4152e8b341d/
diff --git a/root/articles/mmmfs/ba_log/2019-12-20/text$markdown+sidenotes.md b/root/research/mmmfs/ba_log/2019-12-20/text$markdown+sidenotes.md
index 3de1a9c..3de1a9c 100644
--- a/root/articles/mmmfs/ba_log/2019-12-20/text$markdown+sidenotes.md
+++ b/root/research/mmmfs/ba_log/2019-12-20/text$markdown+sidenotes.md
diff --git a/root/articles/mmmfs/ba_log/intro: text$markdown.md b/root/research/mmmfs/ba_log/intro: text$markdown.md
index 37366cf..37366cf 100644
--- a/root/articles/mmmfs/ba_log/intro: text$markdown.md
+++ b/root/research/mmmfs/ba_log/intro: text$markdown.md
diff --git a/root/articles/mmmfs/ba_log/print: text$moonscript -> fn -> mmm$dom.moon b/root/research/mmmfs/ba_log/print: text$moonscript -> fn -> mmm$dom.moon
index 97ebd4c..97ebd4c 100644
--- a/root/articles/mmmfs/ba_log/print: text$moonscript -> fn -> mmm$dom.moon
+++ b/root/research/mmmfs/ba_log/print: text$moonscript -> fn -> mmm$dom.moon
diff --git a/root/articles/mmmfs/ba_log/start/text$markdown.md b/root/research/mmmfs/ba_log/start/text$markdown.md
index d56130b..d56130b 100644
--- a/root/articles/mmmfs/ba_log/start/text$markdown.md
+++ b/root/research/mmmfs/ba_log/start/text$markdown.md
diff --git a/root/articles/mmmfs/ba_log/text$moonscript -> fn -> mmm$dom.moon b/root/research/mmmfs/ba_log/text$moonscript -> fn -> mmm$dom.moon
index b6b0756..b6b0756 100644
--- a/root/articles/mmmfs/ba_log/text$moonscript -> fn -> mmm$dom.moon
+++ b/root/research/mmmfs/ba_log/text$moonscript -> fn -> mmm$dom.moon
diff --git a/root/articles/mmmfs/conclusion/text$markdown+sidenotes.md b/root/research/mmmfs/conclusion/text$markdown+sidenotes.md
index 92230a0..92230a0 100644
--- a/root/articles/mmmfs/conclusion/text$markdown+sidenotes.md
+++ b/root/research/mmmfs/conclusion/text$markdown+sidenotes.md
diff --git a/root/research/mmmfs/defense/$order b/root/research/mmmfs/defense/$order
new file mode 100644
index 0000000..278bf54
--- /dev/null
+++ b/root/research/mmmfs/defense/$order
@@ -0,0 +1,13 @@
+01
+02
+03a
+03b
+03c
+04a
+04b
+04c
+05a
+05b
+06
+07
+08
diff --git a/root/research/mmmfs/defense/01/text$html+frag.html b/root/research/mmmfs/defense/01/text$html+frag.html
new file mode 100644
index 0000000..f84e3b5
--- /dev/null
+++ b/root/research/mmmfs/defense/01/text$html+frag.html
@@ -0,0 +1,8 @@
+<div style="margin-top: 3em">
+  <h2>Empowered End-User Computing</h2>
+  <br />
+  <h4>A Historical Investigation and Development of a File-System-Based Environment</h3>
+  <br />
+  <br />
+  <p>sol bekic, 2019 - 2020</p>
+</div>
diff --git a/root/research/mmmfs/defense/02/text$markdown+wide.md b/root/research/mmmfs/defense/02/text$markdown+wide.md
new file mode 100644
index 0000000..e797a7a
--- /dev/null
+++ b/root/research/mmmfs/defense/02/text$markdown+wide.md
@@ -0,0 +1,13 @@
+what are we talking about?
+--------------------------
+
+<br />
+
+- personal computing
+  - journaling
+  - collecting, producing, organising content 
+  - multi-format, multi-media content
+- online presence
+  - blogging
+  - publishing
+  - project documentation
diff --git a/root/research/mmmfs/defense/03a/text$markdown+wide.md b/root/research/mmmfs/defense/03a/text$markdown+wide.md
new file mode 100644
index 0000000..c3d2441
--- /dev/null
+++ b/root/research/mmmfs/defense/03a/text$markdown+wide.md
@@ -0,0 +1,12 @@
+design principles
+-----------------
+
+<br />
+
+### modularity (UNIX Philosophy)
+
+- few, strong concepts and metaphors
+
+- customizability
+
+- openness for integrations
diff --git a/root/research/mmmfs/defense/03b/text$markdown+wide.md b/root/research/mmmfs/defense/03b/text$markdown+wide.md
new file mode 100644
index 0000000..cfd9e44
--- /dev/null
+++ b/root/research/mmmfs/defense/03b/text$markdown+wide.md
@@ -0,0 +1,10 @@
+design principles
+-----------------
+
+<br />
+
+### 'living system' (Ink & Switch)
+
+- small feedback loops
+ 
+- (perceived) direct manipulation of concrete entitites
diff --git a/root/research/mmmfs/defense/03c/text$markdown+wide.md b/root/research/mmmfs/defense/03c/text$markdown+wide.md
new file mode 100644
index 0000000..234caff
--- /dev/null
+++ b/root/research/mmmfs/defense/03c/text$markdown+wide.md
@@ -0,0 +1,10 @@
+design principles
+-----------------
+
+<br />
+
+### 'in-place toolchain' (Ink & Switch)
+
+- tools for creation embedded in the substrate
+
+- small step between 'passively using' and 'actively creating' 
diff --git a/root/research/mmmfs/defense/04a/text$markdown+wide.md b/root/research/mmmfs/defense/04a/text$markdown+wide.md
new file mode 100644
index 0000000..fe36f82
--- /dev/null
+++ b/root/research/mmmfs/defense/04a/text$markdown+wide.md
@@ -0,0 +1,11 @@
+contrast to current mainstream
+------------------------------
+
+<br />
+
+### devs vs users
+
+- users access to technology inherently limited
+
+- developers are non-experts
+  - no development from practice
diff --git a/root/research/mmmfs/defense/04b/text$markdown+wide.md b/root/research/mmmfs/defense/04b/text$markdown+wide.md
new file mode 100644
index 0000000..b90a203
--- /dev/null
+++ b/root/research/mmmfs/defense/04b/text$markdown+wide.md
@@ -0,0 +1,12 @@
+contrast to current mainstream
+------------------------------
+
+<br />
+
+### apps vs tools
+
+- customer lock-in
+  - customizibility disincentivized
+
+- unhealthy competition ('NIH' syndrome)
+  - interoperability disincentivized
diff --git a/root/research/mmmfs/defense/04c/text$markdown+wide.md b/root/research/mmmfs/defense/04c/text$markdown+wide.md
new file mode 100644
index 0000000..14cc529
--- /dev/null
+++ b/root/research/mmmfs/defense/04c/text$markdown+wide.md
@@ -0,0 +1,11 @@
+contrast to current mainstream
+------------------------------
+
+<br />
+
+### cloud vs local
+
+- dependence and reliability
+ 
+- literal and perceived data ownership
+  - file formats
diff --git a/root/research/mmmfs/defense/05a/text$markdown+wide.md b/root/research/mmmfs/defense/05a/text$markdown+wide.md
new file mode 100644
index 0000000..53c5fcf
--- /dev/null
+++ b/root/research/mmmfs/defense/05a/text$markdown+wide.md
@@ -0,0 +1,10 @@
+implementation concepts
+-----------------------
+
+<br />
+
+### *Fileders* and *Facets*
+
+<br />
+
+<mmm-embed wrap="raw" path="../../mmmfs/tree_mmmfs"></mmm-embed>
diff --git a/root/research/mmmfs/defense/05b/text$markdown+wide.md b/root/research/mmmfs/defense/05b/text$markdown+wide.md
new file mode 100644
index 0000000..63a1b68
--- /dev/null
+++ b/root/research/mmmfs/defense/05b/text$markdown+wide.md
@@ -0,0 +1,10 @@
+implementation concepts
+-----------------------
+
+<br />
+
+### *Types* and *Type Coercion*
+
+<br />
+
+<mmm-embed wrap="raw" path="../../mmmfs/type_coercion_graph"></mmm-embed>
diff --git a/root/research/mmmfs/defense/06/text$markdown+wide.md b/root/research/mmmfs/defense/06/text$markdown+wide.md
new file mode 100644
index 0000000..caf80d4
--- /dev/null
+++ b/root/research/mmmfs/defense/06/text$markdown+wide.md
@@ -0,0 +1,6 @@
+demo
+----
+
+<br />
+
+- (this presentation)
diff --git a/root/research/mmmfs/defense/07/text$markdown+wide.md b/root/research/mmmfs/defense/07/text$markdown+wide.md
new file mode 100644
index 0000000..2688f4e
--- /dev/null
+++ b/root/research/mmmfs/defense/07/text$markdown+wide.md
@@ -0,0 +1,4 @@
+demo
+----
+
+<mmm-embed wrap="raw" path="../../examples/pinwall"></mmm-embed>
diff --git a/root/research/mmmfs/defense/08/$order b/root/research/mmmfs/defense/08/$order
new file mode 100644
index 0000000..773b222
--- /dev/null
+++ b/root/research/mmmfs/defense/08/$order
@@ -0,0 +1 @@
+image
diff --git a/root/research/mmmfs/defense/08/image/image$png.png b/root/research/mmmfs/defense/08/image/image$png.png
new file mode 100644
index 0000000..ff82a9d
--- /dev/null
+++ b/root/research/mmmfs/defense/08/image/image$png.png
diff --git a/root/research/mmmfs/defense/08/text$markdown+wide.md b/root/research/mmmfs/defense/08/text$markdown+wide.md
new file mode 100644
index 0000000..472b796
--- /dev/null
+++ b/root/research/mmmfs/defense/08/text$markdown+wide.md
@@ -0,0 +1,10 @@
+demo
+----
+
+<br />
+
+### in-system editing
+
+- <mmm-link path="../../examples/pinwall">the pinwall example</mmm-link>
+ 
+- (time to leave this box)
diff --git a/root/research/mmmfs/defense/text$moonscript -> fn -> mmm$dom.moon b/root/research/mmmfs/defense/text$moonscript -> fn -> mmm$dom.moon
new file mode 100644
index 0000000..12781b8
--- /dev/null
+++ b/root/research/mmmfs/defense/text$moonscript -> fn -> mmm$dom.moon
@@ -0,0 +1,77 @@
+import ReactiveVar, tohtml, fromhtml, text, elements from require 'mmm.component'
+import article, button, div, span from elements
+
+after = (promise, fn) ->
+  print promise
+  promise['then'] promise, fn
+
+=>
+  index = ReactiveVar 1
+  slide = index\map (index) -> @children[index]
+
+  local view
+  view = div {
+    style:
+      position: 'relative'
+      'padding-top': '56.25%'
+
+    div {
+      style:
+        position: 'absolute'
+        display: 'flex'
+        'flex-direction': 'column'
+        top: 0
+        left: 0
+        right: 0
+        bottom: 0
+        padding: '1em'
+        background: '#eeeeee'
+        'box-sizing': 'border-box'
+        'text-justify': 'none'
+
+      slide\map => @get 'mmm/dom'
+    }
+  }
+
+  local left, right, viewNode
+  if MODE == 'CLIENT'
+    left = (_, e) ->
+      e\preventDefault!
+      index\transform (a) -> math.max 1, a - 1
+
+    right = (_, e) ->
+      e\preventDefault!
+      index\transform (a) -> math.min #@children, a + 1
+
+    viewNode = tohtml view
+    viewNode.tabIndex = 1
+    scale = ->
+      size = viewNode.offsetHeight / 15
+      viewNode.style.fontSize = "#{size}px"
+    viewNode\addEventListener 'keydown', (_, e) ->
+      switch e.key
+        when 'f'
+          after viewNode\requestFullscreen!, scale
+        when 'r'
+          scale!
+        when 'ArrowLeft'
+          left _, e
+        when 'ArrowRight'
+          right _, e
+
+  tohtml with article!
+    \append div {
+      style:
+        display: 'flex'
+
+      button '<', onclick: left
+      ' '
+      span index\map (t) -> text t
+      ' '
+      button '>', onclick: right
+      div style: flex: '1'
+      button 'fullscreen', onclick: (_, e) ->
+        e\preventDefault!
+        after viewNode\requestFullscreen!, scale
+    }
+    \append view
diff --git a/root/articles/mmmfs/description: text$plain b/root/research/mmmfs/description: text$plain
index 1322f1d..1322f1d 100644
--- a/root/articles/mmmfs/description: text$plain
+++ b/root/research/mmmfs/description: text$plain
diff --git a/root/articles/mmmfs/evaluation/text$markdown+sidenotes.md b/root/research/mmmfs/evaluation/text$markdown+sidenotes.md
index 65024d4..65024d4 100644
--- a/root/articles/mmmfs/evaluation/text$markdown+sidenotes.md
+++ b/root/research/mmmfs/evaluation/text$markdown+sidenotes.md
diff --git a/root/articles/mmmfs/examples/$order b/root/research/mmmfs/examples/$order
index 4ee3140..4ee3140 100644
--- a/root/articles/mmmfs/examples/$order
+++ b/root/research/mmmfs/examples/$order
diff --git a/root/articles/mmmfs/examples/gallery/$order b/root/research/mmmfs/examples/gallery/$order
index 9d438bd..9d438bd 100644
--- a/root/articles/mmmfs/examples/gallery/$order
+++ b/root/research/mmmfs/examples/gallery/$order
diff --git a/root/articles/mmmfs/examples/gallery/actual_image/image$png.png b/root/research/mmmfs/examples/gallery/actual_image/image$png.png
index b499413..b499413 100644
--- a/root/articles/mmmfs/examples/gallery/actual_image/image$png.png
+++ b/root/research/mmmfs/examples/gallery/actual_image/image$png.png
diff --git a/root/articles/mmmfs/examples/gallery/actual_image/preview: image$png.png b/root/research/mmmfs/examples/gallery/actual_image/preview: image$png.png
index f9dbfad..f9dbfad 100644
--- a/root/articles/mmmfs/examples/gallery/actual_image/preview: image$png.png
+++ b/root/research/mmmfs/examples/gallery/actual_image/preview: image$png.png
diff --git a/root/articles/mmmfs/examples/gallery/link_to_image/URL -> image$png b/root/research/mmmfs/examples/gallery/link_to_image/URL -> image$png
index 7cf76ff..7cf76ff 100644
--- a/root/articles/mmmfs/examples/gallery/link_to_image/URL -> image$png
+++ b/root/research/mmmfs/examples/gallery/link_to_image/URL -> image$png
diff --git a/root/articles/mmmfs/examples/gallery/link_to_image/preview: URL -> image$png b/root/research/mmmfs/examples/gallery/link_to_image/preview: URL -> image$png
index 2b2233b..2b2233b 100644
--- a/root/articles/mmmfs/examples/gallery/link_to_image/preview: URL -> image$png
+++ b/root/research/mmmfs/examples/gallery/link_to_image/preview: URL -> image$png
diff --git a/root/articles/mmmfs/examples/gallery/slideshow: text$moonscript -> fn -> mmm$component.moon b/root/research/mmmfs/examples/gallery/slideshow: text$moonscript -> fn -> mmm$component.moon
index 0178ac2..0178ac2 100644
--- a/root/articles/mmmfs/examples/gallery/slideshow: text$moonscript -> fn -> mmm$component.moon
+++ b/root/research/mmmfs/examples/gallery/slideshow: text$moonscript -> fn -> mmm$component.moon
diff --git a/root/articles/mmmfs/examples/gallery/text$moonscript -> fn -> mmm$dom.moon b/root/research/mmmfs/examples/gallery/text$moonscript -> fn -> mmm$dom.moon
index 9bdac54..9bdac54 100644
--- a/root/articles/mmmfs/examples/gallery/text$moonscript -> fn -> mmm$dom.moon
+++ b/root/research/mmmfs/examples/gallery/text$moonscript -> fn -> mmm$dom.moon
diff --git a/root/articles/mmmfs/examples/gallery/title: text$plain b/root/research/mmmfs/examples/gallery/title: text$plain
index 2e9ef34..2e9ef34 100644
--- a/root/articles/mmmfs/examples/gallery/title: text$plain
+++ b/root/research/mmmfs/examples/gallery/title: text$plain
diff --git a/root/articles/mmmfs/examples/image/URL -> image$png b/root/research/mmmfs/examples/image/URL -> image$png
index c586722..c586722 100644
--- a/root/articles/mmmfs/examples/image/URL -> image$png
+++ b/root/research/mmmfs/examples/image/URL -> image$png
diff --git a/root/articles/mmmfs/examples/image/title: text$plain b/root/research/mmmfs/examples/image/title: text$plain
index dca924f..dca924f 100644
--- a/root/articles/mmmfs/examples/image/title: text$plain
+++ b/root/research/mmmfs/examples/image/title: text$plain
diff --git a/root/articles/mmmfs/examples/implementation: text$markdown+sidenotes.md b/root/research/mmmfs/examples/implementation: text$markdown+sidenotes.md
index 8a6a185..8a6a185 100644
--- a/root/articles/mmmfs/examples/implementation: text$markdown+sidenotes.md
+++ b/root/research/mmmfs/examples/implementation: text$markdown+sidenotes.md
diff --git a/root/articles/mmmfs/examples/intro: text$markdown+sidenotes.md b/root/research/mmmfs/examples/intro: text$markdown+sidenotes.md
index 126f407..126f407 100644
--- a/root/articles/mmmfs/examples/intro: text$markdown+sidenotes.md
+++ b/root/research/mmmfs/examples/intro: text$markdown+sidenotes.md
diff --git a/root/articles/mmmfs/examples/language_support/$order b/root/research/mmmfs/examples/language_support/$order
index 3cc0e47..3cc0e47 100644
--- a/root/articles/mmmfs/examples/language_support/$order
+++ b/root/research/mmmfs/examples/language_support/$order
diff --git a/root/articles/mmmfs/examples/language_support/javascript/text$javascript -> mmm$dom.js b/root/research/mmmfs/examples/language_support/javascript/text$javascript -> mmm$dom.js
index de56531..de56531 100644
--- a/root/articles/mmmfs/examples/language_support/javascript/text$javascript -> mmm$dom.js
+++ b/root/research/mmmfs/examples/language_support/javascript/text$javascript -> mmm$dom.js
diff --git a/root/articles/mmmfs/examples/language_support/javascript/title: text$plain b/root/research/mmmfs/examples/language_support/javascript/title: text$plain
index 581fbc7..581fbc7 100644
--- a/root/articles/mmmfs/examples/language_support/javascript/title: text$plain
+++ b/root/research/mmmfs/examples/language_support/javascript/title: text$plain
diff --git a/root/articles/mmmfs/examples/language_support/lua/text$lua -> mmm$dom.lua b/root/research/mmmfs/examples/language_support/lua/text$lua -> mmm$dom.lua
index 62e79f1..62e79f1 100644
--- a/root/articles/mmmfs/examples/language_support/lua/text$lua -> mmm$dom.lua
+++ b/root/research/mmmfs/examples/language_support/lua/text$lua -> mmm$dom.lua
diff --git a/root/articles/mmmfs/examples/language_support/lua/title: text$plain b/root/research/mmmfs/examples/language_support/lua/title: text$plain
index 0f9d550..0f9d550 100644
--- a/root/articles/mmmfs/examples/language_support/lua/title: text$plain
+++ b/root/research/mmmfs/examples/language_support/lua/title: text$plain
diff --git a/root/articles/mmmfs/examples/language_support/moonscript/text$moonscript -> mmm$dom.moon b/root/research/mmmfs/examples/language_support/moonscript/text$moonscript -> mmm$dom.moon
index 5cc50e6..5cc50e6 100644
--- a/root/articles/mmmfs/examples/language_support/moonscript/text$moonscript -> mmm$dom.moon
+++ b/root/research/mmmfs/examples/language_support/moonscript/text$moonscript -> mmm$dom.moon
diff --git a/root/articles/mmmfs/examples/language_support/moonscript/title: text$plain b/root/research/mmmfs/examples/language_support/moonscript/title: text$plain
index f8871ac..f8871ac 100644
--- a/root/articles/mmmfs/examples/language_support/moonscript/title: text$plain
+++ b/root/research/mmmfs/examples/language_support/moonscript/title: text$plain
diff --git a/root/articles/mmmfs/examples/language_support/preview: text$markdown b/root/research/mmmfs/examples/language_support/preview: text$markdown
index d6c2845..d6c2845 100644
--- a/root/articles/mmmfs/examples/language_support/preview: text$markdown
+++ b/root/research/mmmfs/examples/language_support/preview: text$markdown
diff --git a/root/articles/mmmfs/examples/language_support/text$moonscript -> fn -> mmm$dom.moon b/root/research/mmmfs/examples/language_support/text$moonscript -> fn -> mmm$dom.moon
index 4ae0679..4ae0679 100644
--- a/root/articles/mmmfs/examples/language_support/text$moonscript -> fn -> mmm$dom.moon
+++ b/root/research/mmmfs/examples/language_support/text$moonscript -> fn -> mmm$dom.moon
diff --git a/root/articles/mmmfs/examples/language_support/title: text$plain b/root/research/mmmfs/examples/language_support/title: text$plain
index ae06474..ae06474 100644
--- a/root/articles/mmmfs/examples/language_support/title: text$plain
+++ b/root/research/mmmfs/examples/language_support/title: text$plain
diff --git a/root/articles/mmmfs/examples/markdown/text$markdown.md b/root/research/mmmfs/examples/markdown/text$markdown.md
index 880eedb..880eedb 100644
--- a/root/articles/mmmfs/examples/markdown/text$markdown.md
+++ b/root/research/mmmfs/examples/markdown/text$markdown.md
diff --git a/root/articles/mmmfs/examples/markdown/title: text$plain b/root/research/mmmfs/examples/markdown/title: text$plain
index 7915148..7915148 100644
--- a/root/articles/mmmfs/examples/markdown/title: text$plain
+++ b/root/research/mmmfs/examples/markdown/title: text$plain
diff --git a/root/articles/mmmfs/examples/pinwall/$order b/root/research/mmmfs/examples/pinwall/$order
index b8b054a..4a12798 100644
--- a/root/articles/mmmfs/examples/pinwall/$order
+++ b/root/research/mmmfs/examples/pinwall/$order
@@ -1,3 +1,4 @@
 image
 text
 video
+youtube_video
diff --git a/root/articles/mmmfs/examples/pinwall/image/image$png.png b/root/research/mmmfs/examples/pinwall/image/image$png.png
index 1628d99..1628d99 100644
--- a/root/articles/mmmfs/examples/pinwall/image/image$png.png
+++ b/root/research/mmmfs/examples/pinwall/image/image$png.png
diff --git a/root/research/mmmfs/examples/pinwall/image/pinwall_info: text$json b/root/research/mmmfs/examples/pinwall/image/pinwall_info: text$json
new file mode 100644
index 0000000..7149346
--- /dev/null
+++ b/root/research/mmmfs/examples/pinwall/image/pinwall_info: text$json
@@ -0,0 +1 @@
+{"x": 117.0, "y": 592.0, "w": 403.0, "h": 296.0}
\ No newline at end of file
diff --git a/root/articles/mmmfs/examples/pinwall/text$moonscript -> fn -> mmm$dom.moon b/root/research/mmmfs/examples/pinwall/text$moonscript -> fn -> mmm$dom.moon
index e611579..90822f2 100644
--- a/root/articles/mmmfs/examples/pinwall/text$moonscript -> fn -> mmm$dom.moon
+++ b/root/research/mmmfs/examples/pinwall/text$moonscript -> fn -> mmm$dom.moon
@@ -31,7 +31,8 @@ CLIENT = MODE == 'CLIENT'
   drag = nil
   
   children = for child in *@children
-      info = (child\get 'pinwall_info: table') or x: 100, y: 100, w: 300, h: 300
+      info = (child\get 'pinwall_info: table') or x: 100, y: 100, w: 560, h: 315
+
       wrapper = div {
         style:
           position: 'absolute'
@@ -76,7 +77,7 @@ CLIENT = MODE == 'CLIENT'
             height: '100%'
             background: 'var(--white)'
 
-          (child\gett 'mmm/dom')
+          (child\get 'mmm/dom') or div '(unrenderable)'
         }
       }
 
diff --git a/root/research/mmmfs/examples/pinwall/text/pinwall_info: text$json b/root/research/mmmfs/examples/pinwall/text/pinwall_info: text$json
new file mode 100644
index 0000000..07a9448
--- /dev/null
+++ b/root/research/mmmfs/examples/pinwall/text/pinwall_info: text$json
@@ -0,0 +1 @@
+{"x": 28.0, "y": 179.0, "w": 1457.0, "h": 246.0}
\ No newline at end of file
diff --git a/root/articles/mmmfs/examples/pinwall/text/text$plain.txt b/root/research/mmmfs/examples/pinwall/text/text$plain.txt
index 8838e5a..8838e5a 100644
--- a/root/articles/mmmfs/examples/pinwall/text/text$plain.txt
+++ b/root/research/mmmfs/examples/pinwall/text/text$plain.txt
diff --git a/root/articles/mmmfs/examples/pinwall/title: text$plain b/root/research/mmmfs/examples/pinwall/title: text$plain
index c629992..c629992 100644
--- a/root/articles/mmmfs/examples/pinwall/title: text$plain
+++ b/root/research/mmmfs/examples/pinwall/title: text$plain
diff --git a/root/articles/mmmfs/examples/pinwall/video/URL -> video$mp4 b/root/research/mmmfs/examples/pinwall/video/URL -> video$mp4
index 6364771..6364771 100644
--- a/root/articles/mmmfs/examples/pinwall/video/URL -> video$mp4
+++ b/root/research/mmmfs/examples/pinwall/video/URL -> video$mp4
diff --git a/root/research/mmmfs/examples/pinwall/video/pinwall_info: text$json b/root/research/mmmfs/examples/pinwall/video/pinwall_info: text$json
new file mode 100644
index 0000000..fefad32
--- /dev/null
+++ b/root/research/mmmfs/examples/pinwall/video/pinwall_info: text$json
@@ -0,0 +1 @@
+{"x": 1247.0, "y": 643.0, "w": 483.0, "h": 272.0}
\ No newline at end of file
diff --git a/root/research/mmmfs/examples/pinwall/youtube_video/URL -> youtube$video b/root/research/mmmfs/examples/pinwall/youtube_video/URL -> youtube$video
new file mode 100644
index 0000000..7552ebe
--- /dev/null
+++ b/root/research/mmmfs/examples/pinwall/youtube_video/URL -> youtube$video
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=ZXqgFb1U7q0
\ No newline at end of file
diff --git a/root/research/mmmfs/examples/pinwall/youtube_video/pinwall_info: text$json b/root/research/mmmfs/examples/pinwall/youtube_video/pinwall_info: text$json
new file mode 100644
index 0000000..3e145f1
--- /dev/null
+++ b/root/research/mmmfs/examples/pinwall/youtube_video/pinwall_info: text$json
@@ -0,0 +1 @@
+{"x": 391.0, "y": 238.0, "w": 560.0, "h": 315.0}
\ No newline at end of file
diff --git a/root/articles/mmmfs/examples/text$moonscript -> fn -> mmm$dom.moon b/root/research/mmmfs/examples/text$moonscript -> fn -> mmm$dom.moon
index 2988f29..2988f29 100644
--- a/root/articles/mmmfs/examples/text$moonscript -> fn -> mmm$dom.moon
+++ b/root/research/mmmfs/examples/text$moonscript -> fn -> mmm$dom.moon
diff --git a/root/articles/mmmfs/framework/text$markdown+sidenotes.md b/root/research/mmmfs/framework/text$markdown+sidenotes.md
index e5f3c7e..e5f3c7e 100644
--- a/root/articles/mmmfs/framework/text$markdown+sidenotes.md
+++ b/root/research/mmmfs/framework/text$markdown+sidenotes.md
diff --git a/root/articles/mmmfs/historical-approaches/$order b/root/research/mmmfs/historical-approaches/$order
index b98a91b..b98a91b 100644
--- a/root/articles/mmmfs/historical-approaches/$order
+++ b/root/research/mmmfs/historical-approaches/$order
diff --git a/root/articles/mmmfs/historical-approaches/star-graph/image$png.png b/root/research/mmmfs/historical-approaches/star-graph/image$png.png
index ed4003c..ed4003c 100644
--- a/root/articles/mmmfs/historical-approaches/star-graph/image$png.png
+++ b/root/research/mmmfs/historical-approaches/star-graph/image$png.png
diff --git a/root/articles/mmmfs/historical-approaches/star-graph/note: text$markdown.md b/root/research/mmmfs/historical-approaches/star-graph/note: text$markdown.md
index eb115dd..eb115dd 100644
--- a/root/articles/mmmfs/historical-approaches/star-graph/note: text$markdown.md
+++ b/root/research/mmmfs/historical-approaches/star-graph/note: text$markdown.md
diff --git a/root/articles/mmmfs/historical-approaches/text$markdown+sidenotes.md b/root/research/mmmfs/historical-approaches/text$markdown+sidenotes.md
index dfe9390..dfe9390 100644
--- a/root/articles/mmmfs/historical-approaches/text$markdown+sidenotes.md
+++ b/root/research/mmmfs/historical-approaches/text$markdown+sidenotes.md
diff --git a/root/articles/mmmfs/introduction/text$markdown.md b/root/research/mmmfs/introduction/text$markdown.md
index b8550fe..b8550fe 100644
--- a/root/articles/mmmfs/introduction/text$markdown.md
+++ b/root/research/mmmfs/introduction/text$markdown.md
diff --git a/root/articles/mmmfs/mmmfs/$order b/root/research/mmmfs/mmmfs/$order
index 5a5d5ab..5a5d5ab 100644
--- a/root/articles/mmmfs/mmmfs/$order
+++ b/root/research/mmmfs/mmmfs/$order
diff --git a/root/articles/mmmfs/mmmfs/text$markdown+sidenotes.md b/root/research/mmmfs/mmmfs/text$markdown+sidenotes.md
index f04e671..f04e671 100644
--- a/root/articles/mmmfs/mmmfs/text$markdown+sidenotes.md
+++ b/root/research/mmmfs/mmmfs/text$markdown+sidenotes.md
diff --git a/root/articles/mmmfs/mmmfs/tree_mainstream/text$mermaid-graph b/root/research/mmmfs/mmmfs/tree_mainstream/text$mermaid-graph
index 3227e47..3227e47 100644
--- a/root/articles/mmmfs/mmmfs/tree_mainstream/text$mermaid-graph
+++ b/root/research/mmmfs/mmmfs/tree_mainstream/text$mermaid-graph
diff --git a/root/articles/mmmfs/mmmfs/tree_mmmfs/text$mermaid-graph b/root/research/mmmfs/mmmfs/tree_mmmfs/text$mermaid-graph
index 7b4f6f4..7b4f6f4 100644
--- a/root/articles/mmmfs/mmmfs/tree_mmmfs/text$mermaid-graph
+++ b/root/research/mmmfs/mmmfs/tree_mmmfs/text$mermaid-graph
diff --git a/root/articles/mmmfs/mmmfs/type_coercion_graph/text$mermaid-graph b/root/research/mmmfs/mmmfs/type_coercion_graph/text$mermaid-graph
index cf2cf1e..cf2cf1e 100644
--- a/root/articles/mmmfs/mmmfs/type_coercion_graph/text$mermaid-graph
+++ b/root/research/mmmfs/mmmfs/type_coercion_graph/text$mermaid-graph
diff --git a/root/articles/mmmfs/motivation/$order b/root/research/mmmfs/motivation/$order
index accfc0b..accfc0b 100644
--- a/root/articles/mmmfs/motivation/$order
+++ b/root/research/mmmfs/motivation/$order
diff --git a/root/articles/mmmfs/motivation/app-types/text$markdown.md b/root/research/mmmfs/motivation/app-types/text$markdown.md
index aedef1c..aedef1c 100644
--- a/root/articles/mmmfs/motivation/app-types/text$markdown.md
+++ b/root/research/mmmfs/motivation/app-types/text$markdown.md
diff --git a/root/articles/mmmfs/motivation/creative/text$markdown.md b/root/research/mmmfs/motivation/creative/text$markdown.md
index 9dd6162..9dd6162 100644
--- a/root/articles/mmmfs/motivation/creative/text$markdown.md
+++ b/root/research/mmmfs/motivation/creative/text$markdown.md
diff --git a/root/articles/mmmfs/motivation/text$markdown+sidenotes.md b/root/research/mmmfs/motivation/text$markdown+sidenotes.md
index 64a3459..64a3459 100644
--- a/root/articles/mmmfs/motivation/text$markdown+sidenotes.md
+++ b/root/research/mmmfs/motivation/text$markdown+sidenotes.md
diff --git a/root/articles/mmmfs/print: text$moonscript -> fn -> mmm$dom.moon b/root/research/mmmfs/print: text$moonscript -> fn -> mmm$dom.moon
index 615075a..615075a 100644
--- a/root/articles/mmmfs/print: text$moonscript -> fn -> mmm$dom.moon
+++ b/root/research/mmmfs/print: text$moonscript -> fn -> mmm$dom.moon
diff --git a/root/articles/mmmfs/references/$order b/root/research/mmmfs/references/$order
index d2a668b..d2a668b 100644
--- a/root/articles/mmmfs/references/$order
+++ b/root/research/mmmfs/references/$order
diff --git a/root/articles/mmmfs/references/acm-dl/text$bibtex b/root/research/mmmfs/references/acm-dl/text$bibtex
index 8fb36a2..8fb36a2 100644
--- a/root/articles/mmmfs/references/acm-dl/text$bibtex
+++ b/root/research/mmmfs/references/acm-dl/text$bibtex
diff --git a/root/articles/mmmfs/references/adobe/text$bibtex b/root/research/mmmfs/references/adobe/text$bibtex
index 55904aa..55904aa 100644
--- a/root/articles/mmmfs/references/adobe/text$bibtex
+++ b/root/research/mmmfs/references/adobe/text$bibtex
diff --git a/root/articles/mmmfs/references/alternatives-to-trees/text$bibtex b/root/research/mmmfs/references/alternatives-to-trees/text$bibtex
index 19c134e..19c134e 100644
--- a/root/articles/mmmfs/references/alternatives-to-trees/text$bibtex
+++ b/root/research/mmmfs/references/alternatives-to-trees/text$bibtex
diff --git a/root/articles/mmmfs/references/appliances/text$bibtex b/root/research/mmmfs/references/appliances/text$bibtex
index 56fa8c8..56fa8c8 100644
--- a/root/articles/mmmfs/references/appliances/text$bibtex
+++ b/root/research/mmmfs/references/appliances/text$bibtex
diff --git a/root/articles/mmmfs/references/aspect-ratios/text$bibtex b/root/research/mmmfs/references/aspect-ratios/text$bibtex
index 37cea92..37cea92 100644
--- a/root/articles/mmmfs/references/aspect-ratios/text$bibtex
+++ b/root/research/mmmfs/references/aspect-ratios/text$bibtex
diff --git a/root/articles/mmmfs/references/dijkstra/text$bibtex b/root/research/mmmfs/references/dijkstra/text$bibtex
index c38a470..c38a470 100644
--- a/root/articles/mmmfs/references/dijkstra/text$bibtex
+++ b/root/research/mmmfs/references/dijkstra/text$bibtex
diff --git a/root/articles/mmmfs/references/hypercard/text$bibtex b/root/research/mmmfs/references/hypercard/text$bibtex
index b23cfcb..b23cfcb 100644
--- a/root/articles/mmmfs/references/hypercard/text$bibtex
+++ b/root/research/mmmfs/references/hypercard/text$bibtex
diff --git a/root/articles/mmmfs/references/inkandswitch/markdown: text$moonscript -> fn -> text$markdown.md b/root/research/mmmfs/references/inkandswitch/markdown: text$moonscript -> fn -> text$markdown.md
index 9439841..9439841 100644
--- a/root/articles/mmmfs/references/inkandswitch/markdown: text$moonscript -> fn -> text$markdown.md
+++ b/root/research/mmmfs/references/inkandswitch/markdown: text$moonscript -> fn -> text$markdown.md
diff --git a/root/articles/mmmfs/references/inkandswitch/text$bibtex b/root/research/mmmfs/references/inkandswitch/text$bibtex
index 8b5f298..8b5f298 100644
--- a/root/articles/mmmfs/references/inkandswitch/text$bibtex
+++ b/root/research/mmmfs/references/inkandswitch/text$bibtex
diff --git a/root/articles/mmmfs/references/linux-exec/text$bibtex b/root/research/mmmfs/references/linux-exec/text$bibtex
index e0e415f..e0e415f 100644
--- a/root/articles/mmmfs/references/linux-exec/text$bibtex
+++ b/root/research/mmmfs/references/linux-exec/text$bibtex
diff --git a/root/articles/mmmfs/references/lock-in/text$bibtex b/root/research/mmmfs/references/lock-in/text$bibtex
index 28d780c..28d780c 100644
--- a/root/articles/mmmfs/references/lock-in/text$bibtex
+++ b/root/research/mmmfs/references/lock-in/text$bibtex
diff --git a/root/articles/mmmfs/references/market-share/text$bibtex b/root/research/mmmfs/references/market-share/text$bibtex
index 430af2f..430af2f 100644
--- a/root/articles/mmmfs/references/market-share/text$bibtex
+++ b/root/research/mmmfs/references/market-share/text$bibtex
diff --git a/root/articles/mmmfs/references/memex/text$bibtex b/root/research/mmmfs/references/memex/text$bibtex
index 313eec7..313eec7 100644
--- a/root/articles/mmmfs/references/memex/text$bibtex
+++ b/root/research/mmmfs/references/memex/text$bibtex
diff --git a/root/articles/mmmfs/references/mime-types/text$bibtex b/root/research/mmmfs/references/mime-types/text$bibtex
index c49b553..c49b553 100644
--- a/root/articles/mmmfs/references/mime-types/text$bibtex
+++ b/root/research/mmmfs/references/mime-types/text$bibtex
diff --git a/root/articles/mmmfs/references/osx-files/text$bibtex b/root/research/mmmfs/references/osx-files/text$bibtex
index 7c70a87..7c70a87 100644
--- a/root/articles/mmmfs/references/osx-files/text$bibtex
+++ b/root/research/mmmfs/references/osx-files/text$bibtex
diff --git a/root/articles/mmmfs/references/poc-or-gtfo/text$bibtex b/root/research/mmmfs/references/poc-or-gtfo/text$bibtex
index 7cac092..7cac092 100644
--- a/root/articles/mmmfs/references/poc-or-gtfo/text$bibtex
+++ b/root/research/mmmfs/references/poc-or-gtfo/text$bibtex
diff --git a/root/articles/mmmfs/references/renaming/text$bibtex b/root/research/mmmfs/references/renaming/text$bibtex
index 660bc2c..660bc2c 100644
--- a/root/articles/mmmfs/references/renaming/text$bibtex
+++ b/root/research/mmmfs/references/renaming/text$bibtex
diff --git a/root/articles/mmmfs/references/subtext/cite$doi b/root/research/mmmfs/references/subtext/cite$doi
index 2ac65b5..2ac65b5 100644
--- a/root/articles/mmmfs/references/subtext/cite$doi
+++ b/root/research/mmmfs/references/subtext/cite$doi
diff --git a/root/articles/mmmfs/references/subtext/text$bibtex b/root/research/mmmfs/references/subtext/text$bibtex
index 7e9eb9d..7e9eb9d 100644
--- a/root/articles/mmmfs/references/subtext/text$bibtex
+++ b/root/research/mmmfs/references/subtext/text$bibtex
diff --git a/root/articles/mmmfs/references/super-powers/text$bibtex b/root/research/mmmfs/references/super-powers/text$bibtex
index 5eabda8..5eabda8 100644
--- a/root/articles/mmmfs/references/super-powers/text$bibtex
+++ b/root/research/mmmfs/references/super-powers/text$bibtex
diff --git a/root/articles/mmmfs/references/text$moonscript -> fn -> mmm$dom.moon b/root/research/mmmfs/references/text$moonscript -> fn -> mmm$dom.moon
index 7b96c10..7b96c10 100644
--- a/root/articles/mmmfs/references/text$moonscript -> fn -> mmm$dom.moon
+++ b/root/research/mmmfs/references/text$moonscript -> fn -> mmm$dom.moon
diff --git a/root/articles/mmmfs/references/transclusion/text$bibtex b/root/research/mmmfs/references/transclusion/text$bibtex
index e323662..e323662 100644
--- a/root/articles/mmmfs/references/transclusion/text$bibtex
+++ b/root/research/mmmfs/references/transclusion/text$bibtex
diff --git a/root/articles/mmmfs/references/unix/text$bibtex b/root/research/mmmfs/references/unix/text$bibtex
index 70b139d..70b139d 100644
--- a/root/articles/mmmfs/references/unix/text$bibtex
+++ b/root/research/mmmfs/references/unix/text$bibtex
diff --git a/root/articles/mmmfs/references/wikipedia/text$bibtex b/root/research/mmmfs/references/wikipedia/text$bibtex
index d88d58c..d88d58c 100644
--- a/root/articles/mmmfs/references/wikipedia/text$bibtex
+++ b/root/research/mmmfs/references/wikipedia/text$bibtex
diff --git a/root/articles/mmmfs/references/xerox-star/cite$doi b/root/research/mmmfs/references/xerox-star/cite$doi
index b849172..b849172 100644
--- a/root/articles/mmmfs/references/xerox-star/cite$doi
+++ b/root/research/mmmfs/references/xerox-star/cite$doi
diff --git a/root/articles/mmmfs/references/xerox-star/text$bibtex b/root/research/mmmfs/references/xerox-star/text$bibtex
index 870eed4..870eed4 100644
--- a/root/articles/mmmfs/references/xerox-star/text$bibtex
+++ b/root/research/mmmfs/references/xerox-star/text$bibtex
diff --git a/root/articles/mmmfs/statement-of-originality/text$html+frag.html b/root/research/mmmfs/statement-of-originality/text$html+frag.html
index d6dcbc0..d6dcbc0 100644
--- a/root/articles/mmmfs/statement-of-originality/text$html+frag.html
+++ b/root/research/mmmfs/statement-of-originality/text$html+frag.html
diff --git a/root/articles/mmmfs/table-of-contents/text$html+frag.html b/root/research/mmmfs/table-of-contents/text$html+frag.html
index 2b94109..2b94109 100644
--- a/root/articles/mmmfs/table-of-contents/text$html+frag.html
+++ b/root/research/mmmfs/table-of-contents/text$html+frag.html
diff --git a/root/articles/mmmfs/text$moonscript -> fn -> mmm$dom.moon b/root/research/mmmfs/text$moonscript -> fn -> mmm$dom.moon
index 6c5b1d3..6c5b1d3 100644
--- a/root/articles/mmmfs/text$moonscript -> fn -> mmm$dom.moon
+++ b/root/research/mmmfs/text$moonscript -> fn -> mmm$dom.moon
diff --git a/root/articles/mmmfs/title/text$html+frag.html b/root/research/mmmfs/title/text$html+frag.html
index 063b52a..063b52a 100644
--- a/root/articles/mmmfs/title/text$html+frag.html
+++ b/root/research/mmmfs/title/text$html+frag.html
diff --git a/root/articles/realities/description: text$plain b/root/research/realities/description: text$plain
index c7a0891..c7a0891 100644
--- a/root/articles/realities/description: text$plain
+++ b/root/research/realities/description: text$plain
diff --git a/root/articles/realities/text$moonscript -> mmm$component.moon b/root/research/realities/text$moonscript -> mmm$component.moon
index a7dc365..a7dc365 100644
--- a/root/articles/realities/text$moonscript -> mmm$component.moon
+++ b/root/research/realities/text$moonscript -> mmm$component.moon
diff --git a/root/articles/text$moonscript -> fn -> mmm$dom.moon b/root/research/text$moonscript -> fn -> mmm$dom.moon
index aec02d9..aec02d9 100644
--- a/root/articles/text$moonscript -> fn -> mmm$dom.moon
+++ b/root/research/text$moonscript -> fn -> mmm$dom.moon
diff --git a/root/research/title: text$plain b/root/research/title: text$plain
new file mode 100644
index 0000000..c985e65
--- /dev/null
+++ b/root/research/title: text$plain
@@ -0,0 +1 @@
+research
diff --git a/root/research/watch-cad/description: text$plain b/root/research/watch-cad/description: text$plain
new file mode 100644
index 0000000..75d7887
--- /dev/null
+++ b/root/research/watch-cad/description: text$plain
@@ -0,0 +1 @@
+immediate-mode scripting for direct-manipulation of graphics
diff --git a/root/research/watch-cad/link: URL b/root/research/watch-cad/link: URL
new file mode 100644
index 0000000..fdee7eb
--- /dev/null
+++ b/root/research/watch-cad/link: URL
@@ -0,0 +1 @@
+https://git.s-ol.nu/watch-cad/
diff --git a/root/text$moonscript -> fn -> mmm$dom.moon b/root/text$moonscript -> fn -> mmm$dom.moon
index 8c06030..a77765a 100644
--- a/root/text$moonscript -> fn -> mmm$dom.moon
+++ b/root/text$moonscript -> fn -> mmm$dom.moon
@@ -21,7 +21,7 @@ import link_to from (require 'mmm.mmmfs.util') require 'mmm.dom'
     '.'
     br!
     'Most of the inner-workings of this page are documented in '
-    link_to @walk 'articles/mmmfs'
+    link_to @walk 'research/mmmfs'
     '.'
   }
 
diff --git a/root/workshops/xy-music/slides/08/text$markdown.md b/root/workshops/xy-music/slides/08/text$markdown.md
index 92ab316..1bec5c3 100644
--- a/root/workshops/xy-music/slides/08/text$markdown.md
+++ b/root/workshops/xy-music/slides/08/text$markdown.md
@@ -1,4 +1,4 @@
 what is an oscilloscope?
 ========================
 
-![](/articles/xy-workshop/08/image/:image/png)
+![](/workshops/xy-music/08/image/:image/png)