Major changes to accommodate new SVG file and associated structures.