More work on (potential) file uploader.