Checkpointing. Long way to go before it's working again, but I'm liking the refactor so far.