add persistance or setting -- first fully working version \o/