Okay, the upload script is now pretty good.