Polygons to new style OO & if/else formatting. So. Much Cruft.