Redone everything: no need for CSVFile object