WIP add persistence