Pull back the upload function into a list comprehension as a first baby step toward #49