Cleaned up a bit
SVG not ready