Just a work in progress towards generic upload handling
WIP