Working on argument parsing, moving common logic into functions...