First pass of persistence