Inline upload

PR for review. Not built.
`=>` should be replaced with `->`