INTERIM. Work on persisting.