More progress on uploading attachments