Intermediate commit of code that decomposes composite shapes when added.  Not quite fully functional yet.