Further Geometry work

Golly this GitHub client is laggy