Switched to zipper

Tests are now running but not passing.