(Notifications) Partial and broken. Squash me
(Notifications) Another partial commit. Broken, squash it.