Added Notifiy stuff, @Quintus will be happy about, tests come tomorrow