Added 2 classes
Completed and tested the concrete classes