Break code into better classes, for Alerting