Now a real command line tool.