Notifications working...more or less