Changed the DataContext initialization in views to "viewModel.View = this" to be more like ViewModel-First.