Revert "Somewhat redundant changes (new file_ext, arg parse, etc)" - this breaks...