#822 - more progress on upload status tracking - move to UploadData