diff --git a/character class.md b/character class.md
new file mode 100644
index 000000000..ae0060c12
--- /dev/null
+++ b/character class.md	
@@ -0,0 +1,4 @@
+# character class
+
+- [[pull]] [[rpg classes]]
+
diff --git a/d&d roles.md b/d&d roles.md
new file mode 100644
index 000000000..0560dc54d
--- /dev/null
+++ b/d&d roles.md	
@@ -0,0 +1,4 @@
+# d&d roles
+
+- [[pull]] [[twitter d d roles]]
+
diff --git a/free.md b/free.md
index 31e497408..1795b7060 100644
--- a/free.md
+++ b/free.md
@@ -1,12 +1,10 @@
 # Free
 
 - A [[concept]].
-  - [[available]] to [[all]]
-  - [[unencumbered]]
-- [[flancia]] is [[free]].
-  - [[pull]] [[free software]] [[open source]] [[open ethics]] [[public utility]]
- 
-https://twitter.com/flancian/status/1387531947556196354
-https://twitter.com/flancian/status/1387817572511408128
+  - should be [[available]] to [[all]], but many are [[encumbered]].
+  - [[flancia]] is [[free]].
+    - [[free software]], for [[public utility]].
+  - https://twitter.com/flancian/status/1387531947556196354
+  - https://twitter.com/flancian/status/1387817572511408128
 
 
diff --git a/freedom.md b/freedom.md
new file mode 100644
index 000000000..effabf5c6
--- /dev/null
+++ b/freedom.md
@@ -0,0 +1,4 @@
+# freedom
+
+- In Flancia [[you]] and [[me]] are [[free]].
+
diff --git a/good.md b/good.md
index 39c8f80fe..1e8def1fd 100644
--- a/good.md
+++ b/good.md
@@ -1,10 +1,18 @@
 # Good
 
-- What is good? To be good to others.
-- I believe [[open ethics]] is good.
-- [[Effective Altruism]] is good.
-  - [[Give Directly]] is good.
-- [[Rationality]] is good.
-- [[Compassion]] is good.
-- What is good for you? Pray do tell.
+- I try to be [[good]], but I'm only [[well meaning]].
+  - These are my beliefs.
+  - What is good? To be good to others.
+  - The following are [[good]]:
+    - [[rationality]].
+    - [[honesty]].
+    - [[compassion]].
+    - [[effective altruism]].
+    - [[open ethics]].
+    - [[open source]].
+    - [[groups]] that try to do [[good]].
+    - [[projects]] that try to increase [[public utility]].
+    - [[freedom]].
+  - What is [[good]] for you? 
+    - You can write in the [[Stoa]] below.
 
diff --git a/journal/2021-10-21.md b/journal/2021-10-21.md
index d5fa2fa94..19323c224 100644
--- a/journal/2021-10-21.md
+++ b/journal/2021-10-21.md
@@ -1,4 +1,18 @@
 # 2021-10-21
 
+<<<<<<< HEAD
 - [[nerd club]]
-  - [[friendly ambitious nerds]]
\ No newline at end of file
+  - [[friendly ambitious nerds]]
+=======
+- [[carnivals]]
+  - [[carnival]]
+    - [[flancia]]
+      - [[troupe]]
+        - [[rpg classes]]
+- met [[pesho]] [[ragnar]].
+- [[ui]]
+- [[tit for tat with forgiveness]]
+  - [[robert axelrod]]
+- [[vanguard]]
+- [[mr green]]
+>>>>>>> f77966c32034a20e313b1c0befcc906f0d404742
diff --git a/mr green.md b/mr green.md
new file mode 100644
index 000000000..1b27d5550
--- /dev/null
+++ b/mr green.md	
@@ -0,0 +1,6 @@
+# mr green
+
+- [[2021-10-29]]
+- [[2021-11-12]]
+- [[2021-11-26]]
+- [[2021-12-10]]
diff --git a/nerd club.md b/nerd club.md
new file mode 100644
index 000000000..38870e8d4
--- /dev/null
+++ b/nerd club.md	
@@ -0,0 +1,5 @@
+# nerd club
+
+- [[push]] [[friendly ambitious nerds]]
+  - [[victor hugo]] https://twitter.com/Jeanvaljean689/status/1451271717574217729
+
diff --git a/robert axelrod.md b/robert axelrod.md
index f68641d79..79044c10c 100644
--- a/robert axelrod.md	
+++ b/robert axelrod.md	
@@ -1,2 +1,6 @@
 # Robert Axelrod
 
+- a [[person]]
+  - [[tournament]] https://cs.stanford.edu/people/eroberts/courses/soco/projects/1998-99/game-theory/axelrod.html
+  - [[pull]] [[the evolution of cooperation]]
+
diff --git a/rpg classes.md b/rpg classes.md
new file mode 100644
index 000000000..e0f0a6309
--- /dev/null
+++ b/rpg classes.md	
@@ -0,0 +1,6 @@
+# rpg classes
+
+- [[pull]] [[character class]] [[d&d roles]]
+- [[wp]] https://en.wikipedia.org/wiki/Character_class_(Dungeons_%26_Dragons)
+- [[go]] https://tvtropes.org/pmwiki/pmwiki.php/Main/FantasyCharacterClasses
+
diff --git a/tit for tat with forgiveness.md b/tit for tat with forgiveness.md
new file mode 100644
index 000000000..77ad5b6cd
--- /dev/null
+++ b/tit for tat with forgiveness.md	
@@ -0,0 +1,7 @@
+# tit for tat with forgiveness
+
+- a [[strategy]]
+  - [[tit for tat]] is optimal in many scenarios
+    - plus [[forgiving]]
+  - [[pull]] [[robert axelrod]]
+
diff --git a/tit for tat.md b/tit for tat.md
new file mode 100644
index 000000000..806fd88da
--- /dev/null
+++ b/tit for tat.md	
@@ -0,0 +1,2 @@
+# tit for tat
+
diff --git a/troupe.md b/troupe.md
new file mode 100644
index 000000000..db6a1b423
--- /dev/null
+++ b/troupe.md
@@ -0,0 +1,8 @@
+# troupe
+
+- a [[group]]
+  - [[pull]] [[troupes]]
+  - a group of dancers, actors, or other entertainers who tour to different venues.
+  - [[wp]] https://en.wikipedia.org/wiki/Troupe
+  - https://twitter.com/flancian/status/1451229709103210496
+
diff --git a/troupes.md b/troupes.md
new file mode 100644
index 000000000..dce333778
--- /dev/null
+++ b/troupes.md
@@ -0,0 +1,7 @@
+# troupes
+
+- [[flancia]]
+  - a [[party]]
+    - [[rpg]]
+      - [[d&d roles]]
+
diff --git a/twitter d d roles.md b/twitter d d roles.md
index 3b4f91169..a0168c5fe 100644
--- a/twitter d d roles.md	
+++ b/twitter d d roles.md	
@@ -1,19 +1,19 @@
 # Twitter D&D Roles
 
-- Thread: https://twitter.com/flancian/status/1320089326508822528
+- a [[thread]]: https://twitter.com/flancian/status/1320089326508822528
   - [[lehoczkyescobar]] is a [[true neutral]] [[wizard]].
   - [[pen_coded]] is a [[chaotic good]] [[bard]].
   - [[a_neither]] is a [[chaotic good]] shadow [[knight]].
   - [[s5bug]] was described by [[sodaaddict105]] as a [[chaotic neutral]] [[wizard]].
-  - [[plesmasquerade]] is a [[true neutral]] [[sorcerer]].
-  - [[barbedcatpenis]] is a [[chaotic good]] [[bard]].
-  - [[exotericist]] is a [[chaotic neutral]] [[cleric]].
-  - [[texasfirearm]] is a [[lawful neutral]] [[[cleric]].
-  - [[slehpry]] is a [[neutral good]] [[archer]].
-  - [[forshaper]] is a [[chaotic neutral]] [[blood mage]].
-  - [[virtual1nstinct]] is a [[lawful neutral]] [[cleric]].
-  - [[lukethinksshow]] is a [[neutral good]] [[artificer]].
-  - [[dave_lennard]] is a [[chaotic good]] [[fighter]] and [[druid]].
-  - I consider myself a [[chaotic good]] [[rogue]].
+  - [[plesmasquerade]] is a [[true neutral][sorcerer]].
+  - [[barbedcatpenis]] is a [[chaotic good][bard]].
+  - [[exotericist]] is a [[chaotic neutral][cleric]].
+  - [[texasfirearm]] is a [[lawful neutral][[cleric]].
+  - [[slehpry]] is a [[neutral good][archer]].
+  - [[forshaper]] is a [[chaotic neutral][blood mage]].
+  - [[virtual1nstinct]] is a [[lawful neutral][cleric]].
+  - [[lukethinksshow]] is a [[neutral good][artificer]].
+  - [[dave_lennard]] is a [[chaotic good][fighter]] / [[druid]].
+  - I'm a [[chaotic]] [[good]] [[rogue]].
 
 
diff --git a/ui.md b/ui.md
new file mode 100644
index 000000000..852c39fc2
--- /dev/null
+++ b/ui.md
@@ -0,0 +1,9 @@
+# ui
+
+- Flancia is a [[game]], and every computer game has a [[ui]].
+  - The Agora is 90s looking, partly on purpose, partly due to lack of [[time]] :)
+  - I admire the [[hacker ethos]] so I don't mind [[things]] which are nerdy/old school/[[y2k]] looking.
+  - But I'd love to improve the UI to make it more [[usable]] and [[accessible]].
+  - [[pull]] [[ux]]
+    - the [[agora]] should be [[diverse]] and [[inclusive]].
+
diff --git a/vanguard.md b/vanguard.md
new file mode 100644
index 000000000..d9b8d8528
--- /dev/null
+++ b/vanguard.md
@@ -0,0 +1,7 @@
+# vanguard
+
+- a [[subgroup]]
+  - the leading part of a [[formation]]
+  - [[wp]] https://en.wikipedia.org/wiki/Vanguard
+    - often [[militaristic]] in nature, but I would like to reclaim it for groups in general
+