Add command-line options.

This also lets me call main with options