Adding watch property to fields

Looks like you can't edit an existing pr anymore. But this one will do...