Working version, clean up

removal of using view models.