Adding argument-processing for the CLI on