updates, not sure on ViewModel setup...