Refactoring + Some lemmata about preservation of ZC2 is being proved