Add basic watching functionality