Notif almost done, changed events to methods