Inline upload

PR for review. Not built.
comment or remove