Move to listen instead of watch for services, add restart for services