-Refactor to separate shapes into circles and polys so that they could
potentially be plugin-ified
Note: This will break old scenarios, but its not terribly difficult to
fix it