Added first-pass of uploads (not quite working yet)