Command-line options and argument parsing needs to be improved.
As part of this we should consider migrating to: