Persistence added. Work in progress.