refactoring notifier some. still more to do.