Updates/improvements to the shape class.  Added a shapes example that is much cleaner.