diff --git a/bumblebee/modules/todo.py b/bumblebee/modules/todo.py
new file mode 100644
index 0000000..d96388f
--- /dev/null
+++ b/bumblebee/modules/todo.py
@@ -0,0 +1,48 @@
+# pylint: disable=C0111,R0903
+
+"""Displays the number of todo items from a text file
+
+Parameters:
+    * todo.file: File to read TODOs from (defaults to ~/Documents/todo.txt)
+"""
+
+import platform
+
+import bumblebee.input
+import bumblebee.output
+import bumblebee.engine
+
+
+class Module(bumblebee.engine.Module):
+
+    
+    def __init__(self, engine, config):
+        super(Module, self).__init__(engine, config,
+            bumblebee.output.Widget(full_text=self.output)
+        )
+        self._todos = self.count_items() 
+
+
+    def output(self, widget):
+       self._todos = self.count_items()
+       return str(self._todos)
+
+    
+    def state(self, widgets):
+        if self._todos == 0 :
+            return "empty"
+        return "items"
+        
+
+    def count_items(filename):
+        try:
+            i = -1
+            doc = self.parameter("file", "~/Documents/todo.txt")
+            with open(doc) as f:
+                for i, l in enumerate(f):
+                    pass
+            return i+1 
+        except Exception:
+            return 0
+
+# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json
index bf95f55..596c569 100644
--- a/themes/icons/awesome-fonts.json
+++ b/themes/icons/awesome-fonts.json
@@ -14,6 +14,10 @@
 	"brightness": { "prefix": "" },
 	"load": { "prefix": "" },
 	"layout": { "prefix": "" },
++       "todo": { "empty": {"prefix": "" },
+	+         "items": {"prefix": "" }
+	},
+
 	"cmus": {
 		"playing": { "prefix": "" },
 		"paused": { "prefix": "" },