Working on MVVM