persistant data implemented, working on mobile support