Watcher and variables

@spinscale It has been a little while since I last worked on this problem (can still reproduce it) and I will get back to you asap with a proper response to your suggestion :slight_smile: