Major changes - in process of adding support for different geometries