Final commit before MVVM refactoring.