More work in progress on the uploader client.