Initial work on persistence.