Worked on local data storage...

There are still some work needed