change everything to use angularjs