Github #137: Checkpoint, getting closer...