Added Unit Testing and Commenting to Classes