First attempt at plugging persistency in.