(Notifications) Partial commit, starting unit tests. Squash me