Actually add the rest of the persistence code.