Triangles

Another refactor of triangles.