More progress on the upload handler