BEGIN NG-SERVICE REFACTOR