Fixes a number of harder issues the initial test punted on.
Attach a file by drag & drop or click to upload
