Added more "infrastructure" to make the output file names that we will use
later.