continue working on the ViewModels