Inline upload

PR for review. Not built.
is `_` a convention for "I don't need this parameter" ? I think it's a good and bad idea at the same time, haven't made my mind yet ;-)