diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..dd7a3ea
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,7 @@
+# TODO
+
+For items and features that should be relatively easy/simple to implement. No new components needed,
+just modifying existing code.
+
+* Channel passwords
+* Server passwords
diff --git a/WISHLIST.md b/WISHLIST.md
new file mode 100644
index 0000000..663c466
--- /dev/null
+++ b/WISHLIST.md
@@ -0,0 +1,29 @@
+# Wishlist
+
+For items and features that are further down the road and require some more work and thought to
+implement.
+
+* Designated bot admins
+    * Allow for plugins to query admin users so special functionality is available
+* Tests
+* Acrobot
+    * Acrobot is an IRC game that is (usually) best played in its own channel.
+    * A game of acrobot is broken down into creating the best silly acronym for a random series of
+      letters chosen by the bot.
+    * The goal of the game is to score the most number of votes from other players.
+    * A game looks like this:
+        * Round 1 starts. The bot says "create an acronym for the letters C N M." (letters randomly
+          chosen with a given weight)
+        * Players will DM the bot with their acronym. This keeps things anonymous (important)
+        * After 60 seconds, or when all players submit their acronym (whichever comes first),
+          all acronyms are listed by the bot and players may now vote by DMing the bot with a number
+          for which acronym they're voting for.
+        * Players cannot vote for themselves.
+        * Bot displays who won the most votes and who submitted which entry for that round.
+        * Round 2 starts. The bot says "create an acronym for the letters J L A T". Add one letter
+          each time, increasing the max time by 30 seconds for each letter. A new set of letters is
+          selected. Repeat until all rounds are over (4 rounds is a good number to keep from
+          exhausting people). Tally all votes and announce the winner at the end.
+* MOO-like functionality
+    * This has been started locally, called "arena". If you want to try your hand at implementing
+      it, call it something else!