Added most stuff for triangles