Begun to make changes to geometry and primitives to bring into line with coffeegl