Adding Angular.js in the mix