first working commit of escrow-server integration