unfinished recursive watcher

* autowatch step needs to add watches
* remove watches recursively