More work on Geometry stuff