Converted to an AngularJs app