Large modification,

to the way the chat watch works with minor modifications.