Working towards a less mvvm solution