Rewrote make-csv-reader for speed