Feature/mvvm

I got this building for me. Want to take my changes?