Initial change to conversion to angular.