Partially fixed cloning. Need container work.