Commit 1.25

Still writing the voronoi code.