Finish implementing Uploader