Changed around how the zip is generated - nearly there