Also fixing bunch of failures, still some to go though ...
Attach a file by drag & drop or click to upload
