Last of the notification stuff and validations