Substantial reworking of way CSV files are loaded for SO import