More svg and work for future code rewriting