safe push before massive refactor after design meeting