Revert "Revert "Polygon works""

This reverts commit a16875900f4046714195cc1294fd790bd8c3ec23.