Reading files with the csv module now, for better performance.