Update TODO
Watcher: move out callback from start method into constuctor
WatcherMemory: store 'active' state