Implemented new logic to manage a central watch mechanism
wip