Wrapping up ZIP functionality.  QA away.