Persistent2

Since persistent 2.0 isn't finalized, this shouldn't be merged in yet.