Actually fixing to use native zip, really should get some automated tests here...