Persistence work in progress