Checkpoint.

Context and typing work. More tests.