And we were so far along, too :( crosses fingers for persistent state