diff --git a/conflict.txt b/conflict.txt
new file mode 100644
index 0000000..ca1da7d
--- /dev/null
+++ b/conflict.txt
@@ -0,0 +1,44 @@
+/**
+ * @file API documentation for hook_leader().
+ */
+
+CONFLICT RESOLUTION
+
+This document puts forth a process by which conflict between
+developers can be resolved.
+
+The current process has been to assign contentious problems to a
+'benevolent dictator' who must then understand both the engineering
+problem as well as the social one. This places a great deal of
+responsibility on one person, and violates one of the human
+requirements of governance.
+
+A solution might be the creation of a 'hook_leader()' system. This
+system could be implemented to show the the name of the volunteer
+appended with '_leader()', so for instance webchick would be
+webchick_leader().
+
+hook_leader() can be vetoed by project maintainers at any time.
+hook_leader() is cycled through a number of different users in a
+project who have volunteered or were appointed by the project
+leader, perhaps on a weekly basis or even more frequently. Perhaps
+this could occur on multiple accounts in a project if needed. This
+cycling process would be automatic and out of the control of anyone.
+
+Anyone can reject a request to be a hook_leader() at the nomination
+phase by the project leader. They must, however, be hook_leader()
+when the system picks them. Whether they choose to involve
+themselves in problematic discussions is their choice.
+
+When this king-for-a-day speaks, it is understood that they
+represent a voice of authority within the project, and have the
+ability to take over the conversation and provide a social solution.
+If they are unable to reach a diplomatic solution they can then
+assign the issue to the project leader with appropriate
+documentation in the issue.
+
+At this point the old system takes over.
+
+Note that the hook_leader() leader has no other implicit power or
+priviledge; they have only been chosen by the site to be a leader
+for this time.
diff --git a/governance.txt b/governance.txt
new file mode 100644
index 0000000..8f89219
--- /dev/null
+++ b/governance.txt
@@ -0,0 +1,29 @@
+Human beings require from governance:
+
+1) Structure (Consistency, Rules)
+
+2) Liberty (Freedom, Leeway, Understanding)
+
+3) Moderation of Responsibility (No one should singly bear the
+responsibility of governance forever)
+
+Governance requires from humans:
+
+1) Responsibility (as leadership, as understanding of leaders' role
+and humanity)
+
+2) Decision to participate (if you are participating, then you are
+agreeing to be governed)
+
+Governance is an active form of collective wisdom about the culture,
+held and implemented by people.
+
+All governance systems should reflect this, and can be evaluated by
+asking two questions:
+
+1) Does governance represent a collective wisdom about the culture?
+
+2) Is governance being implemented properly by people?
+
+When either or both of these answers is 'no,' it is time to
+re-evaluate the processes and assumptions of governance.