Removed watchers, temp. Until more code is added to fix.