Added two new classes and used test driven development to help me rebuild event managaer