Command line version coming along.