WIP, add watcher for remote changes