Checkpoint: basic skeleton in place