Add work on persistent

Pretty much just some hacking right now...