Added a shape class thing.