Refactoring; no longer saves SVG files