[CHORE] Starting to add persistence