Svg changes

This commit depends on #3 so the diff will show all those changes as well. Once #3 is merged I'll update this so it only shows the real diff.