[#26] Updated to use ngModel