Actually implement the new command line function. Whoops.