Checkpoint

(configs to disable will come next)