Refine scanning
First draft of the upload script