WIP Local Storage

Rework on Local Repository to enable flushing. Added mapping
Don't think this is needed here any more?