Now only doing a single pass over all of the files