Major classes

Initial development of shapes