progress
working
check
more tests
done
Merge pull request #1243 from john-hill/csv-upload-2

Csv upload 2