WIP: added LazyUpload feature, untested