Checkpoint. Major modifications incoming