Work on new upload function