Beginning to reorganize upload form.