Re-do how Voronoi vertices are treated and saved to make code more modular