Checkpoint

Definitely still debugging.