beginnings of geom/surface support