Added in watch functionality. NOT FULLY TESTED.