For testing change to only have one file downloaded, split out if statement and remove unused code