WIP Adding support for polygons