first attempt to add support for geom but I don't like much the design