Factored out Delaunay logic to Delaunay

Factored out Delaunay logic to Delaunay