Refractoring geometry.
good wip.