Alerts

Merge in incomplete alerts