Testing, refactoring, and fixing bugs. Still need to fix butterfly triangulation.