added zipper support, added marshalling protocol, refactorings