WIP: Refactoring _completeUpload. Just need to fix/add tests