Modifying the alerts to be triggered via a global publish/subscribe mechanism.  Also, some general clean up of the project