updated view models to leverage value injecter for mapping between models -> viewmodels