commit for pull
viewmodels was weird for some reason