#217 Implement new notification system