Move some of the responsibility to orchestra/notifier.

Signed-off-by: crynobone <crynobone@gmail.com>