More progress on CSV uploading.