#104: Use shapefun to draw shape.  Easy to change now.