Local storage of Metadata

I've lost the commit race. There will be a merge
Merge conflicts