Changed to an AngularJS system and am now up to the same point.