--- a/talosnames/main.py	Sun Jul 08 13:53:06 2012 -0700
+++ b/talosnames/main.py	Sun Jul 08 14:20:28 2012 -0700
@@ -7,11 +7,12 @@
 import api
 import sys
 import optparse
+from pprint import pprint
 
-def main(args=sys.argv[:]):
+def main(args=sys.argv[1:]):
 
     # parse command line options
-    usage = '%prog [options]'
+    usage = '%prog [options] [name]'
     class PlainDescriptionFormatter(optparse.IndentedHelpFormatter):
         """description formatter for console script entry point"""
         def format_description(self, description):
@@ -22,8 +23,16 @@
     parser = optparse.OptionParser(usage=usage, description=__doc__, formatter=PlainDescriptionFormatter())
     options, args = parser.parse_args(args)
 
+    # get the names from graphserver
     names = api.TalosNames()
 
+    if not args:
+        args = [None]
+    for arg in args:
+        for name, graphserver_name in names(arg):
+            print '%s : %s' % (name, graphserver_name)
+        print
+
 if __name__ == '__main__':
   main()