Notification scaffold
Final correction to initial code