deleted some things i dont need and upgraded to angular 1.2