Data upload v0.2 (bit more)

Idem