Preparing for a large refactor to the MVVM architectural pattern.