2. Put back changes that Shon rolled back to so that exporter compiles again 3. Put in new typesafe helper for creating nodes so we dont have to rely on strings.
