Added function composition, and beginning svg function->svg support