diff --git a/cli.py b/cli.py
index 2c3cb13..f73955b 100644
--- a/cli.py
+++ b/cli.py
@@ -1,10 +1,14 @@
+import os
 import sys
+import optparse
+import inspect
 
-from annotator.app import app, setup_app
+from annotator.app import setup_app as _setup_app
 import annotator.model as model
 
 
 def fixtures():
+    '''Create some fixtures (e.g. for demoing).'''
     acc = model.Account.get('tester')
     if acc is None:
         acc = model.Account(
@@ -23,10 +27,46 @@ def fixtures():
     print 'Fixtures created (tester@annotateit.org / pass)'
 
 
-if __name__ == '__main__':
-    setup_app()
-    action = sys.argv[1]
-    if action == 'fixtures':
-        fixtures()
+def _module_functions(functions):
+    local_functions = dict(functions)
+    for k,v in local_functions.items():
+        if not inspect.isfunction(v) or k.startswith('_'):
+            del local_functions[k]
+    return local_functions
+
+def _main(functions_or_object):
+    isobject = inspect.isclass(functions_or_object)
+    if isobject:
+        _methods = _object_methods(functions_or_object)
+    else:
+        _methods = _module_functions(functions_or_object)
+
+    usage = '''%prog {action}
+
+Actions:
+    '''
+    usage += '\n    '.join(
+        [ '%s: %s' % (name, m.__doc__.split('\n')[0] if m.__doc__ else '') for (name,m)
+        in sorted(_methods.items()) ])
+    parser = optparse.OptionParser(usage)
+    # Optional: for a config file
+    # parser.add_option('-c', '--config', dest='config',
+    #         help='Config file to use.')
+    options, args = parser.parse_args()
 
+    if not args or not args[0] in _methods:
+        parser.print_help()
+        sys.exit(1)
+
+    method = args[0]
+    if isobject:
+        getattr(functions_or_object(), method)(*args[1:])
+    else:
+        _methods[method](*args[1:])
+
+__all__ = [ '_main' ]
+
+if __name__ == '__main__':
+    _setup_app()
+    _main(locals())