Updating the uploader class
Pushing final changes before tonight