Could do with some tracing in here, in case gets stuck on lengthy persist lock at this point..