This just became way more than persistence.

I’m trying to effectively refactor things, so that they are simpler,
and can be tested.