Shapes.
Cleaned up shapes.
failing test
Merge pull request #210 from shans/shapes

Shapes