Commit 1.26

Still working on triangulation