WIP reorganizing command-line arguments