Multi file upload

This is a pull request into sha256-custom branch.
Space before TODO.