Refactor everything to use points & polygons.