First pass at zip support