diff --git a/bumblebee/modules/pomodoro.py b/bumblebee/modules/pomodoro.py
new file mode 100644
index 0000000..92f9dcf
--- /dev/null
+++ b/bumblebee/modules/pomodoro.py
@@ -0,0 +1,67 @@
+# pylint: disable=C0111,R0903
+
+"""Display and run a Pomodoro timer.
+Left click to start timer, left click again to pause.
+Right click will cancel the timer.
+"""
+
+import datetime
+
+import bumblebee.input
+import bumblebee.output
+import bumblebee.engine
+
+class Module(bumblebee.engine.Module):
+    def __init__(self, engine, config):
+        widgets = bumblebee.output.Widget(full_text=self.text)
+        self.remaining_time = datetime.timedelta(minutes=25)
+        self.remaining_time_str = "{}min{}s ".format(int((self.remaining_time.seconds / 60)),
+                                                     round((self.remaining_time.seconds/60) % 1*60))
+        self.time = None
+        self.pomodoro = { "state":"OFF", "type": "n/a"}
+        self._text = self.remaining_time_str + self.pomodoro["type"] + " " + self.pomodoro["state"]
+        super(Module, self).__init__(engine, config, widgets)
+        engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE,
+                                       cmd=self.timer_play_pause)
+        engine.input.register_callback(self, button=bumblebee.input.RIGHT_MOUSE,
+                                       cmd=self.timer_reset)
+        
+    def text(self, widget):
+        return "{}".format(self._text) 
+        
+    def update(self, widget):
+        if self.pomodoro["state"] == "ON":
+            timediff = (datetime.datetime.now() - self.time)
+            if timediff.seconds >= 0:
+                self.remaining_time -= timediff
+                self.time = datetime.datetime.now()
+
+            if self.remaining_time.seconds <= 0:
+                if self.pomodoro["type"] == "WORK":
+                    self.pomodoro["type"] = "PLAY"
+                    self.remaining_time = datetime.timedelta(minutes=25)
+                elif self.pomodoro["type"] == "PLAY":
+                    self.pomodoro["type"] = "WORK"
+                    self.remaining_time = datetime.timedelta(minutes=5)
+
+        self.remaining_time_str = "{}min{}s ".format(int((self.remaining_time.seconds / 60)),
+                                                    round((self.remaining_time.seconds / 60) % 1 * 60))
+        self._text = self.remaining_time_str + self.pomodoro["type"] + " " + self.pomodoro["state"]
+    
+    def timer_play_pause(self, widget):
+        if self.pomodoro["state"] == "OFF":
+            self.pomodoro = {"state": "ON", "type": "WORK"}
+            self.remaining_time = datetime.timedelta(minutes=25)
+            self.time = datetime.datetime.now()
+        elif self.pomodoro["state"] == "ON":
+            self.pomodoro["state"] = "PAUSED"
+            self.remaining_time -= (datetime.datetime.now() - self.time)
+            self.time = datetime.datetime.now()
+        elif self.pomodoro["state"] == "PAUSED":
+            self.pomodoro["state"] = "ON"
+            self.time = datetime.datetime.now()
+
+    def timer_reset(self, widget):
+        if self.pomodoro["state"] == "ON" or self.pomodoro["state"] == "PAUSED":
+            self.pomodoro = {"state":"OFF", "type": "n/a" }
+            self.remaining_time = datetime.timedelta(minutes=25)
\ No newline at end of file