Add ability to export svg/png, not completed
Commiting merge