prepare for multi-geometries, but needs change from @tschaub before I can finish it off