A version of watch which actually supports filters

Until mikeal publishes...