More work on command line wrapper.