Lots more persistence work