More MVVM. Prepare for more renames.
puttering
Renaming again.