Geometry part II
More work on rendering system