More work on the zip upload stuff