Initial work on upload retries