Started working on local cacheing of data