moving some config into viewmodel
more pruning