WIP Local Storage

Rework on Local Repository to enable flushing. Added mapping
Can we remove this space... I know very minor.