Working on the ViewModel