Refactoring & beginning work on a real notification cllass