Unfinished work on persistence, on hold for now