Getting started on the local storage feature.
Local storage complete, commit and merge to trunk