Watch process

It looks a bit "hackish" here I think we can do something smarter. I will check