#123 For Groups as well and some notification stuff