Initial work

Checkpoint

Checkpoint

Checkpoint

Checkpoint

More boilerplate