Changes to to data design, some cleanup
Work on inbox ViewModels