Notifications almost there, the queries are a little weird