Meant to add notifications email stuff