Shift to AngularJS