added stop service TODO's