moved more code to Zippable