MVVM hackup wip