WIP shift notification to keyValueObserving