Checkpoint working on initial refactor
Checkpoint