WIP: enable watch on node changes