More work done on applying MVVM