Begin to add persistence logic