More Viewmodel changes.

So Goehring can start working correctly.