More work on uploader.