added test
moved to shared notifier, cleanup option trigger, component to core