Is this `TODO` a `PersistenceHelper` thing? If so, should it not go there?