diff --git a/sopel_modules/SpiceBot/Commands.py b/sopel_modules/SpiceBot/Commands.py
index 4efdca0..ac328c8 100644
--- a/sopel_modules/SpiceBot/Commands.py
+++ b/sopel_modules/SpiceBot/Commands.py
@@ -43,6 +43,7 @@ class BotCommands():
                                 },
                     'disabled': {},
                     }
+        self.todo_list = []
         self.module_files_parse()
         self.nickrules()
         for comtype in ['module', 'nickname', 'rule']:
@@ -280,6 +281,7 @@ class BotCommands():
             comdict["foldername"] = str(foldername)
 
             detected_lines = []
+            todo_list = []
             for line in module_file_lines:
 
                 if str(line).startswith("@"):
@@ -296,18 +298,25 @@ class BotCommands():
                     elif str(line).startswith(tuple(["rule", "module.rule", "sopel.module.rule"])):
                         line = str(line).split("rule")[-1]
                         line = "rule" + line
+                    elif "TODO" in str(line):
+                        todo_list.append(str(line))
                     else:
                         line = None
 
                     if line:
                         detected_lines.append(line)
 
+            if len(todo_list):
+                self.todo_list.append(todo_list)
+
             if len(detected_lines):
 
                 filelinelist = []
                 for detected_line in detected_lines:
                     validcomdict = copy.deepcopy(comdict)
 
+                    validcomdict["TODO"] = todo_list
+
                     # Commands
                     if str(detected_line).startswith("commands"):
                         comtype = "module"
diff --git a/sopel_modules/SpiceBot_Core_Commands/TODO.py b/sopel_modules/SpiceBot_Core_Commands/TODO.py
new file mode 100644
index 0000000..e42face
--- /dev/null
+++ b/sopel_modules/SpiceBot_Core_Commands/TODO.py
@@ -0,0 +1,16 @@
+# coding=utf8
+from __future__ import unicode_literals, absolute_import, division, print_function
+"""
+This is the SpiceBot Users system.
+"""
+import sopel
+
+import sopel_modules.SpiceBot as SpiceBot
+from sopel_modules.spicemanip import spicemanip
+
+
+@SpiceBot.prerun('nickname')
+@sopel.module.nickname_commands('todo')
+def nickname_comand_users(bot, trigger, botcom):
+    todo_task = spicemanip(SpiceBot.commands.todo_list, 'random')
+    bot.osd(["Random TODO task for you: {}.".format(todo_task)])
diff --git a/sopel_modules/SpiceBot_Core_Commands/__init__.py b/sopel_modules/SpiceBot_Core_Commands/__init__.py
index bcdf439..0136317 100644
--- a/sopel_modules/SpiceBot_Core_Commands/__init__.py
+++ b/sopel_modules/SpiceBot_Core_Commands/__init__.py
@@ -25,6 +25,7 @@ from .Gif import *
 from .Sherlock import *
 from .Reddit import *
 from .DictComs import *
+from .TODO import *
 
 __author__ = 'Sam Zick'
 __email__ = 'sam@deathbybandaid.net'