Added alert queue, and brought code coverage to 98%