First version where new and simple upload works