Move closer to `upload` working