I'll merge this now, but something that occurred to me is this doesn't appear to be a model for a specific View, and so isn't really a View Model. We should address that at some point.