diff --git a/.gitignore b/.gitignore
index 89e8265..821089d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,9 @@ var/
 .installed.cfg
 *.egg
 
+# IDE's
+/.idea
+
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
diff --git a/setup.py b/setup.py
index 013e357..0675a26 100755
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 import sys
 
 from setuptools import find_packages, setup
+import ti
 
 
 def read(*filenames, **kwargs):
@@ -18,7 +19,7 @@ def read(*filenames, **kwargs):
 
 setup(
     name="ti",
-    version="0.1.1.dev0",
+    version=ti.__version__,
     author="Shrikant Sharat",
     author_email="shrikantsharat.k@gmail.com",
     packages=find_packages(),
@@ -29,10 +30,14 @@ def read(*filenames, **kwargs):
     long_description=read('README.rst', 'CHANGES.rst'),
     entry_points={
         'console_scripts': [
-            'ti = ti:main',
+            'ti = ti.time_tracking:main',
         ]
     },
-    install_requires=["colorama", "pyyaml"],
+    install_requires=[
+        "colorama",
+        "PyYAML",
+        "tabulate"
+    ],
     setup_requires=["pytest-runner"] if testing else [],
     tests_require=["pytest", "cram", "pytest-cram"],
     extras_require={
diff --git a/ti/__init__.py b/ti/__init__.py
index 483736f..8c354f8 100755
--- a/ti/__init__.py
+++ b/ti/__init__.py
@@ -1,46 +1,8 @@
 # coding: utf-8
-
-"""
-ti is a simple and extensible time tracker for the command line. Visit the
-project page (http://ti.sharats.me) for more details.
-
-Usage:
-  ti (o|on) <name> [<time>...]
-  ti (f|fin) [<time>...]
-  ti (s|status)
-  ti (t|tag) <tag>...
-  ti (n|note) <note-text>...
-  ti (l|log) [today]
-  ti (e|edit)
-  ti (i|interrupt)
-  ti --no-color
-  ti -h | --help
-
-Options:
-  -h --help         Show this help.
-  <start-time>...   A time specification (goto http://ti.sharats.me for more on
-                    this).
-  <tag>...          Tags can be made of any characters, but its probably a good
-                    idea to avoid whitespace.
-  <note-text>...    Some arbitrary text to be added as `notes` to the currently
-                    working project.
-"""
-
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import json
 import os
-import re
-import subprocess
-import sys
-import tempfile
-from datetime import datetime, timedelta
-from collections import defaultdict
-from os import path
+import json
 
-import yaml
-from colorama import Fore
+__version__ = '0.1.1.dev1'
 
 
 class JsonStore(object):
@@ -50,7 +12,7 @@ def __init__(self, filename):
 
     def load(self):
 
-        if path.exists(self.filename):
+        if os.path.exists(self.filename):
             with open(self.filename) as f:
                 data = json.load(f)
 
@@ -64,381 +26,4 @@ def dump(self, data):
             json.dump(data, f, separators=(',', ': '), indent=2)
 
 
-def red(str):
-    if use_color:
-        return Fore.RED + str + Fore.RESET
-    else:
-        return str
-
-
-def green(str):
-    if use_color:
-        return Fore.GREEN + str + Fore.RESET
-    else:
-        return str
-
-
-def yellow(str):
-    if use_color:
-        return Fore.YELLOW + str + Fore.RESET
-    else:
-        return str
-
-
-def blue(str):
-    if use_color:
-        return Fore.BLUE + str + Fore.RESET
-    else:
-        return str
-
-
-def action_on(name, time):
-    data = store.load()
-    work = data['work']
-
-    if work and 'end' not in work[-1]:
-        print('You are already working on ' + yellow(work[-1]['name']) +
-              '. Stop it or use a different sheet.', file=sys.stderr)
-        raise SystemExit(1)
-
-    entry = {
-        'name': name,
-        'start': time,
-    }
-
-    work.append(entry)
-    store.dump(data)
-
-    print('Start working on ' + green(name) + '.')
-
-
-def action_fin(time, back_from_interrupt=True):
-    ensure_working()
-
-    data = store.load()
-
-    current = data['work'][-1]
-    current['end'] = time
-    store.dump(data)
-    print('So you stopped working on ' + red(current['name']) + '.')
-
-    if back_from_interrupt and len(data['interrupt_stack']) > 0:
-        name = data['interrupt_stack'].pop()['name']
-        store.dump(data)
-        action_on(name, time)
-        if len(data['interrupt_stack']) > 0:
-            print('You are now %d deep in interrupts.'
-                  % len(data['interrupt_stack']))
-        else:
-            print('Congrats, you\'re out of interrupts!')
-
-
-def action_interrupt(name, time):
-    ensure_working()
-
-    action_fin(time, back_from_interrupt=False)
-
-    data = store.load()
-    if 'interrupt_stack' not in data:
-        data['interrupt_stack'] = []
-    interrupt_stack = data['interrupt_stack']
-
-    interrupted = data['work'][-1]
-    interrupt_stack.append(interrupted)
-    store.dump(data)
-
-    action_on('interrupt: ' + green(name), time)
-    print('You are now %d deep in interrupts.' % len(interrupt_stack))
-
-
-def action_note(content):
-    ensure_working()
-
-    data = store.load()
-    current = data['work'][-1]
-
-    if 'notes' not in current:
-        current['notes'] = [content]
-    else:
-        current['notes'].append(content)
-
-    store.dump(data)
-
-    print('Yep, noted to ' + yellow(current['name']) + '.')
-
-
-def action_tag(tags):
-    ensure_working()
-
-    data = store.load()
-    current = data['work'][-1]
-
-    current['tags'] = set(current.get('tags') or [])
-    current['tags'].update(tags)
-    current['tags'] = list(current['tags'])
-
-    store.dump(data)
-
-    tag_count = str(len(tags))
-    print('Okay, tagged current work with ' + tag_count + ' tag' +
-          ('s' if tag_count > 1 else '') + '.')
-
-
-def action_status():
-    try:
-        ensure_working()
-    except SystemExit(1):
-        return
-
-    data = store.load()
-    current = data['work'][-1]
-
-    start_time = parse_isotime(current['start'])
-    diff = timegap(start_time, datetime.utcnow())
-
-    print('You have been working on {0} for {1}.'.format(
-        green(current['name']), diff))
-
-
-def action_log(period):
-    data = store.load()
-    work = data['work'] + data['interrupt_stack']
-    log = defaultdict(lambda: {'delta': timedelta()})
-    current = None
-
-    for item in work:
-        start_time = parse_isotime(item['start'])
-        if 'end' in item:
-            log[item['name']]['delta'] += (
-                parse_isotime(item['end']) - start_time)
-        else:
-            log[item['name']]['delta'] += datetime.utcnow() - start_time
-            current = item['name']
-
-    name_col_len = 0
-
-    for name, item in log.items():
-        name_col_len = max(name_col_len, len(name))
-
-        secs = item['delta'].seconds
-        tmsg = []
-
-        if secs > 3600:
-            hours = int(secs / 3600)
-            secs -= hours * 3600
-            tmsg.append(str(hours) + ' hour' + ('s' if hours > 1 else ''))
-
-        if secs > 60:
-            mins = int(secs / 60)
-            secs -= mins * 60
-            tmsg.append(str(mins) + ' minute' + ('s' if mins > 1 else ''))
-
-        if secs:
-            tmsg.append(str(secs) + ' second' + ('s' if secs > 1 else ''))
-
-        log[name]['tmsg'] = ', '.join(tmsg)[::-1].replace(',', '& ', 1)[::-1]
-
-    for name, item in sorted(log.items(), key=(lambda x: x[1]), reverse=True):
-        print(name.ljust(name_col_len), ' ∙∙ ', item['tmsg'],
-              end=' ← working\n' if current == name else '\n')
-
-
-def action_edit():
-    if 'EDITOR' not in os.environ:
-        print("Please set the 'EDITOR' environment variable", file=sys.stderr)
-        raise SystemExit(1)
-
-    data = store.load()
-    yml = yaml.safe_dump(data, default_flow_style=False, allow_unicode=True)
-
-    cmd = os.getenv('EDITOR')
-    fd, temp_path = tempfile.mkstemp(prefix='ti.')
-    with open(temp_path, "r+") as f:
-        f.write(yml.replace('\n- ', '\n\n- '))
-        f.seek(0)
-        subprocess.check_call(cmd + ' ' + temp_path, shell=True)
-        yml = f.read()
-        f.truncate()
-        f.close
-
-    os.close(fd)
-    os.remove(temp_path)
-
-    try:
-        data = yaml.load(yml)
-    except:
-        print("Oops, that YAML didn't appear to be valid!", file=sys.stderr)
-        raise SystemExit(1)
-
-    store.dump(data)
-
-
-def is_working():
-    data = store.load()
-    return data.get('work') and 'end' not in data['work'][-1]
-
-
-def ensure_working():
-    if is_working():
-        return
-
-    print("For all I know, you aren't working on anything. "
-          "I don't know what to do.", file=sys.stderr)
-    print('See `ti -h` to know how to start working.', file=sys.stderr)
-    raise SystemExit(1)
-
-
-def to_datetime(timestr):
-    return parse_engtime(timestr).isoformat() + 'Z'
-
-
-def parse_engtime(timestr):
-
-    now = datetime.utcnow()
-    if not timestr or timestr.strip() == 'now':
-        return now
-
-    match = re.match(r'(\d+|a) \s* (s|secs?|seconds?) \s+ ago $',
-                     timestr, re.X)
-    if match is not None:
-        n = match.group(1)
-        seconds = 1 if n == 'a' else int(n)
-        return now - timedelta(seconds=seconds)
-
-    match = re.match(r'(\d+|a) \s* (mins?|minutes?) \s+ ago $', timestr, re.X)
-    if match is not None:
-        n = match.group(1)
-        minutes = 1 if n == 'a' else int(n)
-        return now - timedelta(minutes=minutes)
-
-    match = re.match(r'(\d+|a|an) \s* (hrs?|hours?) \s+ ago $', timestr, re.X)
-    if match is not None:
-        n = match.group(1)
-        hours = 1 if n in ['a', 'an'] else int(n)
-        return now - timedelta(hours=hours)
-
-    raise ValueError("Don't understand the time '" + timestr + "'")
-
-
-def parse_isotime(isotime):
-    return datetime.strptime(isotime, '%Y-%m-%dT%H:%M:%S.%fZ')
-
-
-def timegap(start_time, end_time):
-    diff = end_time - start_time
-
-    mins = diff.seconds / 60
-
-    if mins == 0:
-        return 'less than a minute'
-    elif mins == 1:
-        return 'a minute'
-    elif mins < 44:
-        return '{} minutes'.format(mins)
-    elif mins < 89:
-        return 'about an hour'
-    elif mins < 1439:
-        return 'about {} hours'.format(mins / 60)
-    elif mins < 2519:
-        return 'about a day'
-    elif mins < 43199:
-        return 'about {} days'.format(mins / 1440)
-    elif mins < 86399:
-        return 'about a month'
-    elif mins < 525599:
-        return 'about {} months'.format(mins / 43200)
-    else:
-        return 'more than a year'
-
-
-def helpful_exit(msg=__doc__):
-    print(msg, file=sys.stderr)
-    raise SystemExit
-
-
-def parse_args(argv=sys.argv):
-    global use_color
-
-    argv = [arg.decode('utf-8') for arg in argv]
-
-    if '--no-color' in argv:
-        use_color = False
-        argv.remove('--no-color')
-
-    # prog = argv[0]
-    if len(argv) == 1:
-        helpful_exit('You must specify a command.')
-
-    head = argv[1]
-    tail = argv[2:]
-
-    if head in ['-h', '--help', 'h', 'help']:
-        helpful_exit()
-
-    elif head in ['e', 'edit']:
-        fn = action_edit
-        args = {}
-
-    elif head in ['o', 'on']:
-        if not tail:
-            helpful_exit('Need the name of whatever you are working on.')
-
-        fn = action_on
-        args = {
-            'name': tail[0],
-            'time': to_datetime(' '.join(tail[1:])),
-        }
-
-    elif head in ['f', 'fin']:
-        fn = action_fin
-        args = {'time': to_datetime(' '.join(tail))}
-
-    elif head in ['s', 'status']:
-        fn = action_status
-        args = {}
-
-    elif head in ['l', 'log']:
-        fn = action_log
-        args = {'period': tail[0] if tail else None}
-
-    elif head in ['t', 'tag']:
-        if not tail:
-            helpful_exit('Please provide at least one tag to add.')
-
-        fn = action_tag
-        args = {'tags': tail}
-
-    elif head in ['n', 'note']:
-        if not tail:
-            helpful_exit('Please provide some text to be noted.')
-
-        fn = action_note
-        args = {'content': ' '.join(tail)}
-
-    elif head in ['i', 'interrupt']:
-        if not tail:
-            helpful_exit('Need the name of whatever you are working on.')
-
-        fn = action_interrupt
-        args = {
-            'name': tail[0],
-            'time': to_datetime(' '.join(tail[1:])),
-        }
-
-    else:
-        helpful_exit("I don't understand '" + head + "'")
-
-    return fn, args
-
-
-def main():
-    fn, args = parse_args()
-    fn(**args)
-
-
-store = JsonStore(os.getenv('SHEET_FILE', None) or
-                  os.path.expanduser('~/.ti-sheet'))
-use_color = True
-
-if __name__ == '__main__':
-    main()
+store = JsonStore(os.getenv('SHEET_FILE', None) or os.path.expanduser('~/.ti-sheet'))
diff --git a/ti/actions.py b/ti/actions.py
new file mode 100644
index 0000000..167de86
--- /dev/null
+++ b/ti/actions.py
@@ -0,0 +1,215 @@
+# coding: utf-8
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import yaml
+import os
+import subprocess
+import sys
+import tempfile
+from datetime import timedelta
+from collections import defaultdict
+from ti.colors import red, yellow, green
+from ti.utils import datetime, parse_isotime, timegap
+from ti import store
+from tabulate import tabulate
+
+
+def action_on(name, time):
+    data = store.load()
+    work = data['work']
+
+    if work and 'end' not in work[-1]:
+        print('You are already working on ' + yellow(work[-1]['name']) +
+              '. Stop it or use a different sheet.', file=sys.stderr)
+        raise SystemExit(1)
+
+    entry = {
+        'name': name,
+        'start': time,
+    }
+
+    work.append(entry)
+    store.dump(data)
+
+    print('Start working on ' + green(name) + '.')
+
+
+def action_fin(time, back_from_interrupt=True):
+    ensure_working()
+
+    data = store.load()
+
+    current = data['work'][-1]
+    current['end'] = time
+    store.dump(data)
+    print('So you stopped working on ' + red(current['name']) + '.')
+
+    if back_from_interrupt and len(data['interrupt_stack']) > 0:
+        name = data['interrupt_stack'].pop()['name']
+        store.dump(data)
+        action_on(name, time)
+        if len(data['interrupt_stack']) > 0:
+            print('You are now %d deep in interrupts.'
+                  % len(data['interrupt_stack']))
+        else:
+            print('Congrats, you\'re out of interrupts!')
+
+
+def action_interrupt(name, time):
+    ensure_working()
+
+    action_fin(time, back_from_interrupt=False)
+
+    data = store.load()
+    if 'interrupt_stack' not in data:
+        data['interrupt_stack'] = []
+    interrupt_stack = data['interrupt_stack']
+
+    interrupted = data['work'][-1]
+    interrupt_stack.append(interrupted)
+    store.dump(data)
+
+    action_on('interrupt: ' + green(name), time)
+    print('You are now %d deep in interrupts.' % len(interrupt_stack))
+
+
+def action_note(content):
+    ensure_working()
+
+    data = store.load()
+    current = data['work'][-1]
+
+    if 'notes' not in current:
+        current['notes'] = [content]
+    else:
+        current['notes'].append(content)
+
+    store.dump(data)
+
+    print('Yep, noted to ' + yellow(current['name']) + '.')
+
+
+def action_tag(tags):
+    ensure_working()
+
+    data = store.load()
+    current = data['work'][-1]
+
+    current['tags'] = set(current.get('tags') or [])
+    current['tags'].update(tags)
+    current['tags'] = list(current['tags'])
+
+    store.dump(data)
+
+    tag_count = str(len(tags))
+    print('Okay, tagged current work with ' + tag_count + ' tag' +
+          ('s' if tag_count > 1 else '') + '.')
+
+
+def action_status():
+    try:
+        ensure_working()
+    except SystemExit(1):
+        return
+
+    data = store.load()
+    current = data['work'][-1]
+
+    start_time = parse_isotime(current['start'])
+    diff = timegap(start_time, datetime.utcnow())
+
+    print('You have been working on {0} for {1}.'.format(
+        green(current['name']), diff))
+
+
+def action_log(period):
+    data = store.load()
+    work = data['work'] + data['interrupt_stack']
+    log = defaultdict(lambda: {'delta': timedelta()})
+    current = None
+
+    for item in work:
+        start_time = parse_isotime(item['start'])
+        if 'end' in item:
+            log[item['name']]['delta'] += (
+                parse_isotime(item['end']) - start_time)
+        else:
+            log[item['name']]['delta'] += datetime.utcnow() - start_time
+            current = item['name']
+
+    for name, item in log.items():
+        secs = item['delta'].seconds
+        tmsg = []
+
+        if secs > 3600:
+            hours = int(secs / 3600)
+            secs -= hours * 3600
+            tmsg.append(str(hours) + ' hour' + ('s' if hours > 1 else ''))
+
+        if secs > 60:
+            mins = int(secs / 60)
+            secs -= mins * 60
+            tmsg.append(str(mins) + ' minute' + ('s' if mins > 1 else ''))
+
+        if secs:
+            tmsg.append(str(secs) + ' second' + ('s' if secs > 1 else ''))
+
+        log[name]['tmsg'] = ', '.join(tmsg)[::-1].replace(',', '& ', 1)[::-1]
+
+    log_list = []
+    for name, item in log.items():
+        log_list.append(
+            (
+                name,
+                item['tmsg'],
+                ' ← working' if current == name else ''
+            )
+        )
+    data = sorted(log_list, key=lambda x: x[0], reverse=True)
+    print(tabulate(data))
+
+
+def action_edit():
+    if 'EDITOR' not in os.environ:
+        print("Please set the 'EDITOR' environment variable", file=sys.stderr)
+        raise SystemExit(1)
+
+    data = store.load()
+    yml = yaml.safe_dump(data, default_flow_style=False, allow_unicode=True)
+
+    cmd = os.getenv('EDITOR')
+    fd, temp_path = tempfile.mkstemp(prefix='ti.')
+    with open(temp_path, "r+") as f:
+        f.write(yml.replace('\n- ', '\n\n- '))
+        f.seek(0)
+        subprocess.check_call(cmd + ' ' + temp_path, shell=True)
+        yml = f.read()
+        f.truncate()
+        f.close()
+
+    os.close(fd)
+    os.remove(temp_path)
+
+    try:
+        data = yaml.load(yml)
+    except:
+        print("Oops, that YAML didn't appear to be valid!", file=sys.stderr)
+        raise SystemExit(1)
+
+    store.dump(data)
+
+
+def is_working():
+    data = store.load()
+    return data.get('work') and 'end' not in data['work'][-1]
+
+
+def ensure_working():
+    if is_working():
+        return
+
+    print("For all I know, you aren't working on anything. "
+          "I don't know what to do.", file=sys.stderr)
+    print('See `ti -h` to know how to start working.', file=sys.stderr)
+    raise SystemExit(1)
diff --git a/ti/colors.py b/ti/colors.py
new file mode 100644
index 0000000..213e2c7
--- /dev/null
+++ b/ti/colors.py
@@ -0,0 +1,30 @@
+# coding: utf-8
+from colorama import Fore
+
+
+def red(_str, use_color=False):
+    if use_color:
+        return Fore.RED + _str + Fore.RESET
+    else:
+        return _str
+
+
+def green(_str, use_color=False):
+    if use_color:
+        return Fore.GREEN + _str + Fore.RESET
+    else:
+        return _str
+
+
+def yellow(_str, use_color=False):
+    if use_color:
+        return Fore.YELLOW + _str + Fore.RESET
+    else:
+        return _str
+
+
+def blue(_str, use_color=False):
+    if use_color:
+        return Fore.BLUE + _str + Fore.RESET
+    else:
+        return _str
diff --git a/ti/time_tracking.py b/ti/time_tracking.py
new file mode 100644
index 0000000..52ccccb
--- /dev/null
+++ b/ti/time_tracking.py
@@ -0,0 +1,123 @@
+# coding: utf-8
+"""
+ti is a simple and extensible time tracker for the command line. Visit the
+project page (http://ti.sharats.me) for more details.
+
+Usage:
+  ti (o|on) <name> [<time>...]
+  ti (f|fin) [<time>...]
+  ti (s|status)
+  ti (t|tag) <tag>...
+  ti (n|note) <note-text>...
+  ti (l|log) [today]
+  ti (e|edit)
+  ti (i|interrupt)
+  ti --no-color
+  ti -h | --help
+
+Options:
+  -h --help         Show this help.
+  <start-time>...   A time specification (goto http://ti.sharats.me for more on
+                    this).
+  <tag>...          Tags can be made of any characters, but its probably a good
+                    idea to avoid whitespace.
+  <note-text>...    Some arbitrary text to be added as `notes` to the currently
+                    working project.
+"""
+
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import sys
+from .actions import action_edit, action_fin, action_interrupt, action_log, action_note, action_on, \
+    action_status, action_tag
+from .utils import to_datetime
+
+
+def helpful_exit(msg=__doc__):
+    print(msg, file=sys.stderr)
+    raise SystemExit
+
+
+def parse_args(argv=sys.argv):
+    use_color = False
+
+    argv = [arg for arg in argv]
+
+    if '--no-color' in argv:
+        use_color = False
+        argv.remove('--no-color')
+
+    # prog = argv[0]
+    if len(argv) == 1:
+        helpful_exit('You must specify a command.')
+
+    head = argv[1]
+    tail = argv[2:]
+
+    if head in ['-h', '--help', 'h', 'help']:
+        helpful_exit()
+
+    elif head in ['e', 'edit']:
+        fn = action_edit
+        args = {}
+
+    elif head in ['o', 'on']:
+        if not tail:
+            helpful_exit('Need the name of whatever you are working on.')
+
+        fn = action_on
+        args = {
+            'name': tail[0],
+            'time': to_datetime(' '.join(tail[1:])),
+        }
+
+    elif head in ['f', 'fin']:
+        fn = action_fin
+        args = {'time': to_datetime(' '.join(tail))}
+
+    elif head in ['s', 'status']:
+        fn = action_status
+        args = {}
+
+    elif head in ['l', 'log']:
+        fn = action_log
+        args = {'period': tail[0] if tail else None}
+
+    elif head in ['t', 'tag']:
+        if not tail:
+            helpful_exit('Please provide at least one tag to add.')
+
+        fn = action_tag
+        args = {'tags': tail}
+
+    elif head in ['n', 'note']:
+        if not tail:
+            helpful_exit('Please provide some text to be noted.')
+
+        fn = action_note
+        args = {'content': ' '.join(tail)}
+
+    elif head in ['i', 'interrupt']:
+        if not tail:
+            helpful_exit('Need the name of whatever you are working on.')
+
+        fn = action_interrupt
+        args = {
+            'name': tail[0],
+            'time': to_datetime(' '.join(tail[1:])),
+        }
+
+    else:
+        helpful_exit("I don't understand '" + head + "'")
+
+    return fn, args
+
+
+def main():
+    fn, args = parse_args()
+    fn(**args)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/ti/utils.py b/ti/utils.py
new file mode 100644
index 0000000..74a68d1
--- /dev/null
+++ b/ti/utils.py
@@ -0,0 +1,69 @@
+# coding: utf-8
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import re
+from datetime import datetime, timedelta
+
+
+def to_datetime(timestr):
+    return parse_engtime(timestr).isoformat() + 'Z'
+
+
+def parse_engtime(timestr):
+
+    now = datetime.utcnow()
+    if not timestr or timestr.strip() == 'now':
+        return now
+
+    match = re.match(r'(\d+|a) \s* (s|secs?|seconds?) \s+ ago $',
+                     timestr, re.X)
+    if match is not None:
+        n = match.group(1)
+        seconds = 1 if n == 'a' else int(n)
+        return now - timedelta(seconds=seconds)
+
+    match = re.match(r'(\d+|a) \s* (mins?|minutes?) \s+ ago $', timestr, re.X)
+    if match is not None:
+        n = match.group(1)
+        minutes = 1 if n == 'a' else int(n)
+        return now - timedelta(minutes=minutes)
+
+    match = re.match(r'(\d+|a|an) \s* (hrs?|hours?) \s+ ago $', timestr, re.X)
+    if match is not None:
+        n = match.group(1)
+        hours = 1 if n in ['a', 'an'] else int(n)
+        return now - timedelta(hours=hours)
+
+    raise ValueError("Don't understand the time '" + timestr + "'")
+
+
+def parse_isotime(isotime):
+    return datetime.strptime(isotime, '%Y-%m-%dT%H:%M:%S.%fZ')
+
+
+def timegap(start_time, end_time):
+    diff = end_time - start_time
+
+    mins = diff.seconds / 60
+
+    if mins == 0:
+        return 'less than a minute'
+    elif mins == 1:
+        return 'a minute'
+    elif mins < 44:
+        return '{} minutes'.format(mins)
+    elif mins < 89:
+        return 'about an hour'
+    elif mins < 1439:
+        return 'about {} hours'.format(mins / 60)
+    elif mins < 2519:
+        return 'about a day'
+    elif mins < 43199:
+        return 'about {} days'.format(mins / 1440)
+    elif mins < 86399:
+        return 'about a month'
+    elif mins < 525599:
+        return 'about {} months'.format(mins / 43200)
+    else:
+        return 'more than a year'