Checkpoint: Restructuring how to implement Cascade.