8th commit - MVVM