Second commit

try to convert into AngularJS