Updated to ViewModel, and using AutoMapper.