Started work on AngularJS integration