Made some more progress concerning uploads.