Rework file upload. Incorporate uploadtest.html.