Working on 2.0, and adding zip back for 1.5