put model into viewmodel
cleaned up viewmodel
refactored model