Move iteration code to datafetcher; better file names