More work on uploader class