Several changes to the way alerts will work
Comment out Alerter since it's unfinished