Making progress on the uploader...