new interface, zip functionality, cleanup