in the process of refactoring and encapsulating. notification handler completed, authentication handler in progress