Uploader 2

careful!  do not limit compile to safari only