Persitence ...work in progress