Biting off just this bit first as I don't need the changes from a previous PR for this part.
Attach a file by drag & drop or click to upload
