moved TODO to unit test file. need to test unwatch and clear