Finish basic upload, still need testing