new uploader integrated

now some cleanups are necessary