fleshed out viewmodel
Added new fields to viewmodel