Class Diagram 3

Third iteration of Class Diagram