diff --git a/TODO.md b/TODO.md
index d47b65d..1f8396f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,31 +1,49 @@
 # TODO
 
+**N.B.** The terminology used herein is definitely a work in progress, ...
+along with all other aspects.
+
 ## Phase 1
 
-- "Public" View (Not logged in):
-  - [ ] 'Public Newswire'
-    - Curated (syn. Moderated for Indymedia); can be thought of as "Public"
-    - _Emissary Template; same as 'Newswire'_
-  - [ ] 'Stories'
+```
+"PUBLIC":   Viewable when not logged in
+"USER":     Viewable when logged in
+"MOD":      Viewable when logged in with sufficient permissions
+```
+
+### Behaviour
+
+- [ ] 'Federated Flow' [other name?]
+    - (syn. Newswire for Indymedia)
+    - _Emissary Template; based on 'inbox' ?_
+    - PUBLIC:
+        - View
+            - Curated (syn. Moderated for Indymedia)
+    - MOD:
+        - View
+            - Uncurated (syn. Unmoderated for Indymedia)
+        - Edit: Mark item(s) as "public"/"private"
+            - Filters (hash tags, users, whole instances, ...)
+            - Individual items/objects
+- [ ] 'Stories'
     - (syn. Features for Indymedia)
     - _Emissary Template(s)_
-      - based on ?
-      - includes 'Newswire'
-        - Needs an interactive 'Newswire' to cite/reference
-          - Filters
-          - Checkboxes (or equivalent) per item
+        - based on ?
+    - PUBLIC/USER:
+        - View
+    - MOD:
+        - Create/Edit
+            - includes 'Federated Flow'
+                - Needs an interactive 'Federated Flow' to cite/reference
+                    - Filters
+                    - Checkboxes (or equivalent) per item
+- [ ] 'Tagflow'
+    - USER:
+        - Custom streams based on filters
+        - _Emissary Template; based on ?_
 
-- "Private" View (Logged in):
-  - [ ] 'Newswire'
-    - Uncurated (syn. Unmoderated for Indymedia); can be thought of as
-      "Private"
-    - Viewable when logged in with sufficient permissions
-    - _Emissary Template; based on 'inbox'_
-  - [ ] 'Tagflow'
-    - Custom streams based on filters
-    - _Emissary Template; based on ?_
+### Structure
 
-- Instance:
   - [ ] Groups:
     - _Emissary groups_
     - Curators (syn. Moderators)