Offloading heavy geometry

Haven’t checked on the progress of this recently so maybe not ready yet – but I’ll keep an eye on it