Issues/44

I added code to make watch functionality works