Raw upload. Need tests.
Merge