Finished ServiceWatcher

... for now!