Start moving zip export to the model layer.
Merge branch 'master' into zip
More fleshed-out zip export.
Depend on yaml in preparation for the zip merge.