More progress on ViewModel refactoring.