Updating to use AngularJS