moved service, continued work to move to angularjs