Combined our two versions; tesselations still broken, but otherwise 2D is functional