includes a couple of tweaks by me and will need further testing and cleaning
Attach a file by drag & drop or click to upload
