Midway through a huge change to move all viewmodel mapping out of the controllers