Updated to ViewModel style system.