More work on uploader class 2