Much more challenging that I imagined. It seems the code has grown very inter-dependent. This is not ideal and I’m attempting to resolve it with as little changes as possible.