More work on moving options to command line