Worked on moving code from behind forms into ViewModels