Changes to Models and DataManager

This is built upon Ryan's previous PR, to fix merge conflicts and LocalDataStore.

Note that you will need to clear app data or things will explode.