add watching + server