Restructued for testing + added AngularJS