[wip] Upload

close to good-to-merge