Cleaning up a few things. Introduced new version of view model.