Move to using a zip library to unpack