Started further disconnecting Model from View to go into a direction of ViewModel