Continuing creation of classes for Milestone 2